Finish the testing of user model
Merge pull request #10 from JulesWiz/user_spec

Finish the testing of user model
Fixed merge conflicts for routes and user controller