merged with style
git commit -m "merged fix_gemfile"
Merge branch 'fix_gemfile' of github.com:LaunchAcademy/meta_review into heroku_ready
most up to date
added admin
everything merged
Removed extra add username migration
Fixed query
Fixed logic for permissions
Added mandrill api
Merge branch 'live_mailer' of github.com:LaunchAcademy/meta_review into heroku_ready

Conflicts:
	Gemfile
	app/helpers/permission_helper.rb
Merge branch 'master' of heroku.com:meta-review into heroku_ready

Conflicts:
	app/controllers/sites_controller.rb
Fixed permissions
Fixed
Mail
Merge branch 'master' of heroku.com:meta-review into live_mailer
Trying to mail
Changed css button
Trying to fix mailer
Fix hash syntax
Removed blank line