changes to routes and users_controller.rb
Merge branch 'development' of github.com:alevsxm/Team-Doge into development