Fixing all kinds of problems
Merge branch 'master' of https://github.com/kdp8791/ImpressMe

Conflicts:
	app/app/controllers/application_controller.rb