solution to problem 11 added
fixed merge conflict