pulling changes, working on instance db_json
merge
got json into javascript
Merge branch 'master' of github.com:teddythetwig/cis400