Refactoring
Merge branch 'database' of github.com:brycepfrimmer/3350Project into database