Merge pull request #1 from bparrish206/jsonDB

Json db
updated test
updated gruntfile