saving prior to re-pulling master
Merge branch 'master' of https://github.com/LizaHCarter/wine-seller
Enhanced messages page
updated marketplace view
finished sort & filter
Merge branch 'master' of https://github.com/LizaHCarter/wine-seller into sortsearchfilter
Enhanced Bidding functionality & views
Merge pull request #18 from LizaHCarter/sortsearchfilter

Sortsearchfilter