changed Michael's files to work with convention
changed Michael's files to work with convention
Merge branch 'master' of github.com:stuycs-apcs-z/classwork

dfadi#