user route update completes user account
further update accnt route
fix conflicts
Merge branch 'master' of https://github.com/AlienHoboken/divvy