Merge branch 'master' of github.com:jbbrokaw/telephone-project
Merge branch 'master' of github.com:jbbrokaw/telephone-project
Changes game.py to add config defaults for db init
Merge pull request #6 from jbbrokaw/db-stuff

Db stuff