inclass 6 complete
Merge branch 'master' of github.com:trevorsenior/school