merging
Merge remote-tracking branch 'origin/master'

Conflicts:
	Stegreifprojekt2/src/SpielDesLebens.java