Added uml
Merge branch 'JD'

Conflicts:
	.DS_Store