Merge pull request #6 from jmhinric/master

Test files
Gemfile.lock merged
Merge branch 'master' into scattergories
Merge pull request #7 from jmhinric/master

initial JS and game view
Merge pull request #8 from mpvazquez/scattergories

Scattergories
splash page added
Merge pull request #9 from mpvazquez/scattergories

splash page added