exercise 4
Merge branch 'master' of https://github.com/svennyffenegger/ch.bfh.bti7081.s2013.cyan.git