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

Conflicts:
	JimmysCardboardCastle/entities.h