move gem 'coffee-rails' outside of the :assets group (trying to fix 500 on heroku)
move gems outside of the :assets group (trying to fix 500 on heroku)
Merge branch 'master' of heroku.com:aqueous-falls-6292

Conflicts:
	Gemfile
move gems outside of the :assets group (trying to fix 500 on heroku)