working on it
Merge branch 'master' of https://github.com/PKPL/ScorchedEarthTests

Conflicts:
	main.cpp