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

added .ds_store
Merge branch 'master' of https://github.com/TeamVegaCodefellows/MixologyApp into HEAD
Merge pull request #17 from ewelaryba/master

Connected Login Page
fixed conflicts
Merge branch 'master' of https://github.com/jeong-codefellows/MixologyApp
login styling
Merge branch 'master' of github.com:TeamVegaCodefellows/MixologyApp
add drink for no results
Merge pull request #19 from tyleriguchi/master

add drink for no results
more login styling
Merge pull request #20 from ewelaryba/master

more log in style changes
Merge branch 'master' of https://github.com/TeamVegaCodefellows/MixologyApp into HEAD
added login verification