Added more code to fix the pieces
Merge remote-tracking branch 'origin/master'

Conflicts:
	build/classes/stratego/stratego.class