Merge pull request #15 from lu16j/master

req
finished jsoneditor formatting and minor bugs
Merge pull request #7 from michelleoj/master

req