encounter stuff up (needs fix)
added encounter stuff (needs fix)
Merge branch 'master' of https://github.com/stuycs-apcs-z/classwork