player now takes shotgun damage
Merge branch 'master' of https://github.com/explosivose/FutileCoda.git

Conflicts:
	FutileCoda.userprefs