Updated encounter and turn method to implement flee and heavy attack
fixed error
fixed merge conflicts
Merge branch 'master' of github.com:stuycs-apcs-z/classwork