new https server - need to migrate all incoming requests to https
readded deleted entry
arrgh - should be commented out
added foreman
Merge branch 'master' of https://github.com/TeamVegaCodefellows/MixologyApp into HEAD
fixed conflicts
Merge branch 'master' of https://github.com/jeong-codefellows/MixologyApp
login styling
Merge branch 'master' of github.com:TeamVegaCodefellows/MixologyApp
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
recommit for travis build
style changes