lappy files touched
Merge branch 'master' of github.com:DanceableBleats/TactHEX_Calc

Conflicts:
	TactHEX_Combat_Resolver.suo