Merge remote-tracking branch 'upstream/master'
Just pushed my version of the database. Keep in mind that much of the data has been deleted from it but all of the tables and columns should be correct.
Merge pull request #9 from JamesEHammond/master

Database