Merge branch 'master', remote-tracking branch 'upstream/master'
refactor of database and adding scoring updates to use scores properly
Merge pull request #12 from chewbaca53233/master

db refactor and adding scorekeeping to model