fixed compile errors
Merge branch 'master' of https://github.com/stuycs-apcs-z/classwork

Conflicts:
	Stuyablo/2/group1/Character.java
Merge branch 'master' of https://github.com/stuycs-apcs-z/classwork
fixed compile errors
Merge branch 'master' of https://github.com/stuycs-apcs-z/classwork