updated diary from today
Merge branch 'master' of https://github.com/boebu/ch.bfh.bti7081.s2013.yellow.git