Commit
Merge branch 'master' of https://github.com/PKPL/ScorchedEarth

Conflicts:
	menu_new_game.c