Reorganization

Sean
Merge branch 'master' of https://github.com/OrangeSean/DBFinalProject
Merge