Merge branch 'master' of https://github.com/inved1/ch.bfh.bti7081.s2013.black.git