tweaked login
Merge branch 'master' of https://github.com/dordal/userballot

Conflicts:
	app/views/login.html