Added class Equipment
Merge remote-tracking branch 'origin/hannabranch'

Conflicts:
	model.notation
	model.uml