updating user information
Merge branch 'master' of https://github.com/AlienHoboken/divvy