added get /marketplace
merged master, resolved conflicts
finished get /marketplace
Merge pull request #5 from LizaHCarter/marketplace

Marketplace feature added to master