fix
Conflicts:
	FoodStacker.io.js