commit test
Merge branch 'master' of https://github.com/alex124/tp3

Conflicts:
	diagramtp3.jpg