Misc. Changes
Merge branch 'Test' of https://github.com/KingWapo/FoliageFeud into Test

Conflicts:
	FoliageFeud/img/Buttons/loadButton.png