just cleaning some code

as I try to understand all of this...
Merge remote-tracking branch 'origin/master'

Conflicts:
	JHalmaProj/HalmaGameRunner.java
Revert "just cleaning some code"

This reverts commit 9dab27fcbaeaee043c1eaaae657c3122f5c84149.