Updated diary with work from 2013-04-18 and 2013-04-19
Merge branch 'master' of https://github.com/simonkrenger/ch.bfh.bti7081.s2013.pink.git
Merge branch 'master' of https://github.com/simonkrenger/ch.bfh.bti7081.s2013.pink.git
Fixed latest diary entry