Combat 2.0 Update

The long awaited combat update!!!

Thank you all for your suggestions contributing to this update, and feel free to watch the attached video for more details on everything added.