worked on fixing bugs in user
Merge branch 'working' of https://github.com/cougarTech2228/scoutingApp into working