Class Diagram
Merge remote-tracking branch 'origin/Sebastian'
jump
Merge branch 'jimmy'

Conflicts:
	grief/grief/map.txt