Neh
Merge branch 'master' of https://github.com/zenteo/jizzscript.git

Conflicts:
	JizzScript/src/resource/test.jz