Merge branch 'notes'

Conflicts:
	Vendorfile

diff --cc Vendorfile
index 43dd73fadaa995a4d90b59175fda04a18b9b2d7d,197bf575b869af53b3d4219bb3ee965f57003270..a56751196a8228cfc0c52a56dee1b2f2ddf7edf4
--- 1/Vendorfile
--- 2/Vendorfile
+++ b/Vendorfile
@@@ -26,9 -26,10 +26,16 @@@ folder 'vendor/assets' d
      end
    end
  
 +  folder 'jquery' do
 +    from 'git://github.com/jevin/Autogrow-Textarea.git' do
 +      file 'jquery.autogrowtextarea.js', 'jquery.autogrowtextarea.js'
++    end  
++  end
++
+   folder 'ohauth' do
+     from 'git://github.com/tmcw/ohauth.git' do
+       file 'ohauth.js'
+       file 'sha.js'
      end
    end
  end

diff --cc app/assets/stylesheets/common.css.scss
Simple merge