making progress..
Merge branch 'master' of https://github.com/myao1/HW7