git pull stuff
Merge branch 'master' of https://github.com/DevApp2450/DevApp-A

Conflicts:
	app/views/partials/main.html