Started work on problem 7
Completed problem 7
Merge branch 'problem/7' into develop