Merge branch 'master' of
https://github.com/perangkolom/de.htwg.se.perangkolom.git

Conflicts:
	PerangKolom/src/game_StructureElements/Cell.java
hallo comment
Merge branch 'master' of
https://github.com/perangkolom/de.htwg.se.perangkolom.git