added Wizard, fixed Character
fixed merge conflict
fixed merge conflict
Merge branch 'master' of github.com:stuycs-apcs-z/classwork