user auth changes
Merge branch 'master' of https://github.com/JSchulhof/wdi-group-project into JSchulhof-master