testomatic
test
Merge branch 'master' of https://github.com/jcwiggins/jcwjson
Conflicts:
	README.md