Fixed Login Email Field
Merge branch 'master' of https://github.com/d4-ideas/Roshambattle

Conflicts:
	views/login.ejs