Done HW1.5
Merge branch 'master'