Fixed some database stuff.
Merge branch 'master' of github.com:toddn1704/code-musketeers