Homework 7
Merge branch 'Homework7'