new images

replacer main base and shop image and made a merged one and the
training image
Merge branch 'Test' of https://github.com/KingWapo/FoliageFeud into Test

Conflicts:
	FoliageFeud/img/Tiles/mainbase.png
	FoliageFeud/img/Tiles/shop.png