Combat Updated - Round 2

Re-worked combat.  The combat used as default is now similar to how I explained it in the video I released.  I will add in Alternative rules later, the goal is to get working rules enabled first.