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
Initialized Jasmine testing and added three initial tests for the Player class. More on the way.
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 #81 from JohnathanWeisner/JasmineInitialize

Initialized Jasmine testing and added three initial tests for the Player class. More tests on the way.
Merge pull request #83 from shaunmcgeever/testing

Testing
Merge branch 'master' of https://github.com/fiddler-crabs-2014/thedelta
fix merge conflict with coverage folder