Replaced the old TXT diary (with a fancy HTML diary)
Merge branch 'master' of
https://github.com/simonkrenger/ch.bfh.bti7081.s2013.pink.git

Conflicts:
	Project Pink/doc/diary.txt