Merge pull request #44 from brentspector/master

Updated MapEvent, Character, Movement, new Fight