Tnk
Merge branch 'master' of https://github.com/Frotty/24Challenge-3

Conflicts:
	wurst/objectediting/SpawnData.wurst