login working
Merge branch 'master' of https://github.com/h55nick/project3