1.7 & 1.8 are done
Merge branch 'master' of https://github.com/j-tone/HW02.git