s
Merge branch 'master' of https://github.com/redsunschan/RekinGDL.git

Conflicts:
	src/org/denalo/rshc/rekin/game/MainLogicThread.java