Added object diagram
Merge branch 'master' of https://github.com/rolyv/CProvML

Conflicts:
	CPS/model2.uml