Added testing for UserController due to json
Fixed testing for UserController
Merge pull request #7 from JulesWiz/structure

Added testing for UserController
Fixed login/logout and checked for merge conflict.
Fixed conflict.
Removed turbolinks