diary update 12.03.2013
initial commits from discussion about task 3
initial commit from discussion
Merge remote-tracking branch 'origin/master' into test

Conflicts:
	ch.bfh.bti7081.s2013.green/doc/diary.html
Merge branch 'test'

Conflicts:
	ch.bfh.bti7081.s2013.green/doc/diary.html
	ch.bfh.bti7081.s2013.green/doc/tools.html