Merge pull request #1 from ahurley/master

database work
database work
database work 2
Merge pull request #1 from acstache/master

CS460 - Project