merge
Merge branch 'develop' of git@github.com:moritzrupp/music-shop.git into
develop

Conflicts:
	src/test/Test.java