Merge pull request #7 from JamesEHammond/master

Pull Request From JamesEHammond 10/23/2014
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.