Added equipment items and basic MarketPlace buttons
Adding controller for MarketPlace
Merge origin/master into Caleb_Branch
minor weird edits