Refactored user routes to be RESTful
Resolved merge conflicts