update the method
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/init/GogoSmash.java
update the method