Combat 1.2
Merge branch 'master' of https://github.com/RealStandardStudios/RpgApp.git