commit for pull
Merge branch 'master' of https://github.com/Poofyfancypants/Destiny-Falls
Added SetLength from combat state call