Fixed error with ShopScreen
Updated ShopScreen UI to remove and purchase cards
Merge branch 'Matt-Branch-2'

Conflicts:
	core/src/Screens/BoardScreen.java
	core/src/Screens/Dock.java
Fixed Conflicts