Fixed the commit errors. We are still missing some of the info, like the SpecialMove class. Also, the keyboard stuff got put back into the hero subclasses. Until the SpecialMove stuff is finished, I don't want to touch them, lest I cause more conflicts. Let me know when we are ready to pull the keyboard out.