Combat App Upload
Merge https://github.com/dunerunner/combatApp