add feature testing for questions and categories. all passing, but not complete
pull from master, most up to date, plus questions and answers tests
merge conflict with coverage stats
add more tests to question features. functional testing is implemented
Merge branch 'master' into testing

Conflicts:
	coverage/.resultset.json
add associations to factories. testing of relationships is much more accurate
Merge pull request #83 from shaunmcgeever/testing

Testing