Damn Github x.x
Merge branch 'Test' of https://github.com/KingWapo/FoliageFeud into Test

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