Small minion stuff
Merge branch 'master' of https://github.com/Poofyfancypants/Destiny-Falls
Combat selection
Combat
COMBAT
Companion integration
Combat
Fixed companion bug
Merge branch 'master' of https://github.com/Poofyfancypants/Destiny-Falls