added Event, worked on City, Main, and Player
Merge branch 'master' of https://github.com/myran2/Adventure