BlackJack UML Class diagram
Merge remote-tracking branch 'origin/master'

Conflicts:
	ModelingProject1/UMLClassDiagram1.classdiagram.layout