Änderungen
Merge branch 'master' of https://github.com/madevr/fallstudie.git
Änderungen
Merge branch 'master' of https://github.com/madevr/fallstudie.git

Conflicts:
	medcorp/src/Enterprise.java
Merge branch 'master' of https://github.com/madevr/fallstudie.git