fix game reset and burning chop trees
Merge remote-tracking branch 'origin/master'

Conflicts:
	scripts/main.js