Merge branch 'master' of https://github.com/rmelanson0451/451order into rmelanson0451-master

Conflicts:
	app/partials/login.html
	app/partials/nav.html