Edited login
Fixed login
Merge branch 'master' of https://github.com/gajarmin/locationWebsite