login.jade modified
Merge branch 'master' of https://github.com/godfinger/godfinger-web

Conflicts:
	bower.json