diary CS2 Task1
Merge remote-tracking branch 'origin/master'

Conflicts:
	ch.bfh.bti7081.s2013.yellow/doc/cs2_task01/pip_requirements.txt
diary CS2 Task1