completed first draft of wine list activity
merge
merge in winelist