conflict commit
Merge branch 'master' of https://github.com/madevr/fallstudie.git

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