refactoring in questions controller. reduced database calls
merge issue with results
refactored answers and admin answers controllers. created BaseAnswerController for similar methods
resolved minor naming/testing issues. removed tests that are being duplicated by javascript tests.
fix merge conflicts. no major issues, mainly differences in line breaks
merge issue
Merge pull request #125 from shaunmcgeever/refactor

Refactor