Added the ability to hide in the battle. Added tons of descriptions.
Fixed the merge conflicts (names).