Update 4/4 9:21

-Edit database
-Fix bug
Merge pull request #2 from mrcupid12/master

Update 4/4 9:21