New combat UI
Merge pull request #2 from ExiumBob/master

New combat UI