controller.js
fixed merge conflict
did not do anything
fixed merge conflicts
user can create and loggin. Getting random user needs work on back end.