updated to fit the new database design
Merge branch 'master' of github.com:BeatTheBuzzer/CS3282