jncormier24/Emporium — pull request #15 by jncormier24 (2013-05-28 15:31:08+00:00)
Title: Marketplace working

updating the master with the best working copy.