Okay
Merge branch 'master' of https://github.com/zebbedy/jcc2d

Conflicts:
	TEST FILE.txt
Merge branch 'master' of https://github.com/zebbedy/jcc2d

Conflicts:
	TEST FILE.txt
Merge branch 'master' of https://github.com/zebbedy/jcc2d
Message
Merge branch 'master' of https://github.com/zebbedy/jcc2d

Conflicts:
	JimmysCardboardCastle/JimmysCardboardCastle.vcxproj
	JimmysCardboardCastle/JimmysCardboardCastle.vcxproj.filters
	JimmysCardboardCastle/TestWorld.h