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.
fixing signin bug-- 1 failing test but might be because of spyOn
fixed buggy test
Fixes merge conflicts in driver, controller, and index