renamed app.js to server.js
removed loginOnSignup and extra whitespace
cleaned up home and login pages
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/views/home.html