Some redesign of Combat Screen.  Watch this space.  Srsly watch it.
Merge branch 'master' of https://github.com/RealStandardStudios/RpgApp.git