README
Merge branch 'master' of github.com:stuycs-apcs-z/classwork

Conflicts:
	Stuyablo/2/group3/Character.java
a
Merge branch 'master' of github.com:stuycs-apcs-z/classwork
Merge branch 'master' of github.com:stuycs-apcs-z/classwork
changed lots...
Fixed up stuff