Merge pull request #12 from jmhinric/round_view

Round view
Merge pull request #13 from jmhinric/round_view

the category list syncs with the play card slots
Merge pull request #14 from jmhinric/round_view

Add timer and time's up actions
working on roll button for game
merge conflict resolution
completed capybara test for 'a user can play a timed round'
Merge pull request #15 from lovettlovett/test_timer

completed capybara test for 'a user can play a timed round'
random letter shown when you roll the die
reject buttons and css
Merge pull request #16 from mpvazquez/jennifer_changes

Jennifer changes
merge conflict resolve reject button and letter
Merge pull request #17 from jmhinric/master

reject buttons and css
refactor reject buttons
Merge pull request #18 from jmhinric/master

refactor reject buttons
Score is displayed and updated live