rejected answers effect your score
Merge pull request #24 from jenndodd/rejectUpdateScore

rejected answers effect your score
fields are disabled until a user starts the timer
Merge pull request #25 from lovettlovett/disable-inputs-pre-roll

fields are disabled until a user starts the timer
JS test and can't click timer before selecting letter
game and round route changes
fixed merge conflicts
Merge pull request #27 from mpvazquez/jmhinric-master

fixed merge conflicts
added answerPoints
fixed merge conflicts"
Merge pull request #28 from jgypsygrrl/master

added answerPoints
fixed merge conflicts
Merge pull request #29 from jgypsygrrl/master

fixed merge conflicts
setting up redis database
getAnswers, setLetter, autoReject with tests that don't yet pass
Merge pull request #30 from jmhinric/js_model

getAnswers, setLetter, autoReject with tests that don't yet pass
redis implemented into application
Merge branch 'master' of github.com:mpvazquez/scattergories into add_redis
Merge pull request #31 from mpvazquez/add_redis

Redis Added to Rails App
add js model tests and functions for scoring