Sodala
Signed-off-by: David <david.klein@uni-ulm.de>
Merge branch 'master' of https://github.com/Merglasch/SopraTest.git

Conflicts:
	ramshackle.txt