Merge branch 'master' of github.com:zhogar/JSONDrawing

Conflicts:
	README.md
Merge branch 'master' of github.com:zhogar/JSONDrawing

Conflicts:
	README.md