add vote and comment unit testing
answers controller complete
fix merge conflict
Merge branch 'shaunmcgeever-testing'
Merge pull request #32 from plondon/master

fix merge conflict regarding database and log files