Merge pull request #2 from stuycs-softdev/yaseen

Merging DB. cuz woo
bleh