Updated with task07
Merge branch 'master' of github.com:fabaff/ch.bfh.bti7081.s2013.white