some changes in task 2
Merge branch 'master' of https://github.com/fabaff/ch.bfh.bti7081.s2013.white.git
some changes in task2