updated class diagram
Merge remote-tracking branch 'origin/master'

Conflicts:
	ch.bfh.bti7081.s2013.yellow/doc/cs1_task07/classDiagram3.png
updated class diagram