Solved problem 2
Merge branch 'p02'
Solved problem 3
Merge branch 'p03'
Solved problem 4
Merge branch 'p04'