change
Merge remote-tracking branch 'origin/gitistsuper'

Conflicts:
	de.htwg.se.go/src/de/htwg/go/model/GameField.java