Initial user model tests passing
Added users controller spec and tests
Had to comment out 2 tests, questions abound
Resolved merge conflict