Merge branch 'master' of github.com:TeamVegaCodefellows/MixologyApp
connected loginpage
Merge pull request #16 from tyleriguchi/master

added .ds_store
Merge pull request #17 from ewelaryba/master

Connected Login Page
add drink for no results