Making sure you've got all of my changes.
Merge branch 'master' of https://github.com/zebbedy/jcc2d

Conflicts:
	JimmysCardboardCastle/JonathansTestWorld.h
Merge branch 'master' of https://github.com/zebbedy/jcc2d