Integrate Contracts, change Medicament.disease to Disease
Merge branch 'master' of https://github.com/madevr/fallstudie.git

Conflicts:
	medcorp/src/Sales.java