bla
Merge branch 'master' of https://github.com/zian92/SoPra

Conflicts:
	SProject/target/classes/META-INF/maven/Glurak_4B/4B_Glurak/pom.properties