all tests passing, added admin attribute to user
Merge branch 'master' of github.com:ncackerman/WisconsinEngineer