add testing. 85%
Merge branch 'master' into testing
added answers controller spec
Merge branch 'testing' of https://github.com/shaunmcgeever/thedelta into shaunmcgeever-testing

Conflicts:
	app/controllers/questions_controller.rb
	coverage/.last_run.json
	coverage/.resultset.json
	spec/controllers/answers_controller_spec.rb
Merge branch 'shaunmcgeever-testing'
Merge pull request #47 from plondon/master

fix merge conflicts from test files