adding rspec tests
Merge branch 'origin/test' of https://github.com/willzfarmer/twilight into origin/test
Merge remote-tracking branch 'origin/test' into test
edit user controller rspec
rspec running now, working on controller
UsersController rspec done
Merge branch 'test' into dev

Merging to allow for complete testing
Merged with testing and adjusted database