1.7 and 1.8
Merge branch 'master' of https://github.com/CS273team/HW02.git
Merge branch 'master' of https://github.com/CS273team/HW02.git