mirrorrocket
merge
Merge branch 'master' of https://github.com/Frotty/24Challenge

Conflicts:
	wurst/war3map.j