modify git ignore. add tests
laying out question controller tests
fix merge conflicts from new tests
Merge pull request #40 from plondon/master

fix merge conflicts