Merge branch 'master' of https://github.com/toastedtruth/JSON-GUI.git