fix login
Merge branch 'master' of https://github.com/initrunlevel0/AmanKata

Conflicts:
	application.js