Renamed all mentions of state in player.js to snapshots
Merge branch 'master' of https://github.com/fiddler-crabs-2014/thedelta into JasmineTests
Merge branch 'master' of https://github.com/fiddler-crabs-2014/thedelta into JasmineTests
The background no longer has console.log messages and is more blurry. More blurry more better.
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 pull request #124 from JohnathanWeisner/BackgroundUpdate

Background update
merge issue
Merge pull request #125 from shaunmcgeever/refactor

Refactor