added user stuff
Merge branch 'master' of https://github.com/mladmon/cs108-project