exercise 2.4 done
changes on solutions
fix merging problems