Updated diary
Merge branch 'master' of https://github.com/simonkrenger/ch.bfh.bti7081.s2013.pink.git