Rearranges routes to allow for user creation from app
Repairs merge conflict in users controller
can create user in db
whatev
sldkf
Fixes merge conflict in user_controller