Small Change in diagram
Merge branch 'master' of https://github.com/LeonardA-L/hm-devOO

Conflicts:
	titan-shippment/src/controller/Controller.java