Lots of things
Merge branch 'master' of github.com:trappist/rewardrocket

Conflicts:
	app/views/layouts/application.haml
	config/routes.rb