I am so sorry this is the worst commit message ever
Merge branch 'startEating' of https://github.com/nfeliciano/mangiamo into startEating

Conflicts:
	app/client/css/login.css
Minor aesthetic changes to login html and css
Merge branch 'startEating' of https://github.com/nfeliciano/mangiamo into startEating