Started problem 21
Completed problem 21
Merge branch 'problem/21' into develop