merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/de/tudresden/swt14ws18/TotoDataInitializer.java