- Initial commit
- Merge branch 'master' of github.com:jlaso/Jsoneditor

Conflicts:
	README.md