completed problem 7
Merge branch 'problem7'