fix merge conflicts in login page
Merge branch 'master' of github.com:weshack/study_buddy