first commit
user API ready
Merge branch 'master' of https://github.com/gavinc88/cs169warmup