Fixing /login
Merge branch 'master' of https://github.com/TheOstriches/AmarettoApp