user controller tests
Merge branch 'master' of https://github.com/eisenachalex/stack_overflow into controller_tests
Merge pull request #15 from eisenachalex/controller_tests

Nice job, Dainstopher