style changes and fix user auth
Merge branch 'master' of github.com:TaliaS1214/Haus-The-Bot
fix merge conflict