Hooked up encounter popup to code

Encounter popup now has actual effects on the game!
Merge branch 'master' of https://github.com/Maplenormandy/mitsim2014