form correction
Merge branch 'master' into pb/fix-form

Conflicts:
	views/login.jade
Merge pull request #3 from cortezcristian/pb/fix-form

form correction