my changes
Merge remote-tracking branch 'origin/Te

Conflicts:
	SokobanHome/bin/soko/SokoTest.classgg
	SokobanHome/src/soko/SokoTest.java