update user model
Merge branch 'master' of https://github.com/CMU-Allies/www