cleaning.
blah
Merge branch 'master' of https://github.com/lizbot/Trivia-Game
changed some DB things
solved merge conflicts.
DB stuff.