Exercise 2

Merge Exercise 2 branch into master as a seperate branch for Exercise 1 was created