Refactored database scripts
Merge branch 'master' of github.com:brycepfrimmer/3350Project