found typo
Merge branch 'master_inc'

Conflicts:
	THF.lua
modifying Overkill to use different preshot/midshot custom sets