LizaHCarter/wine-seller — pull request #21 by ABarnhard (2014-09-01 04:17:05+00:00)
Title: Enhancetest

Resolved merge conflicts and merging changes from trader-enhance branch, added additional tests