Changed stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	JizzScript/src/resource/test.jz