edited song
edited test
Merge branch 'master' of https://github.com/Asmayra/SoPra.git

Conflicts:
	SoPra/src/main/java/org/model/Song.java
	SoPra/src/main/java/org/testpackage/createTestData.java