Exercise 1 week 2
Merge branch 'master' of github.com:AndersFB/CWP