Merge pull request #8 from lu16j/master

req
Merge pull request #9 from lu16j/master

req
merging jsoneditor.js
merging jsoneditor js file

Merge branch 'master' of https://github.com/michelleoj/6.005SpecsApp
fixed json editor
Merge pull request #3 from michelleoj/master

req