backing up hw6-7 code
Merge branch 'master' of https://github.com/jon514a/homework6-7