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

Conflicts:
	shot_formula.c
	shot_hit.h