got login to work somehow
fixed bug with password
Merge branch 'master' of https://github.com/mdjacton/test
Merge branch 'dev'