Combat beginning
Merge branch 'master' of https://github.com/ClockworkMonkeyStudios/animated-ironman