recompile
Merge branch 'development' of https://github.com/ethanfrogers/intercombat into development
trying to fix something