dont push this
Merge branch 'master' of https://github.com/travispence/Final_Project

Conflicts:
	app/views/layouts/remove_application.html.haml