add answer controller tests
fix merge conflict
Merge pull request #67 from shaunmcgeever/testing

Testing