fixing github breaks

Conflicts:
	FoliageFeud/src/Common/Utility.js
	FoliageFeud/src/Common/shop.js
	FoliageFeud/src/MainGameplay/Gameplay.js