a
Merge remote-tracking branch 'origin/master'

Conflicts:
	TwoTowers/src/allelustwillewigkeit/twotowers/model/Jatekmotor.java