yo
Merge branch 'master' of https://github.com/MaikenBeate/-semanticquiz

Conflicts:
	src/StringManipulation.java