CAM
Merge branch 'master' of https://github.com/Frotty/24Challenge-2

Conflicts:
	wurst/init/GameStart.wurst