final work on chapter 6 and 7
Merge branch 'development' of github.com:nicolas-fricke/semmul2013-group1 into development