Merge pull request #3 from mpvazquez/scattergories

testing pull feature on personal repo
Merge pull request #4 from mpvazquez/scattergories

removing database yml file
Merge pull request #5 from mpvazquez/scattergories

Added Gems to Gemfile for testing
Test files
Merge pull request #6 from jmhinric/master

Test files
Gemfile.lock merged
Merge branch 'master' into scattergories