Merge branch 'master' of github.com:RossWittenberg/drink_finder into css
stylesheets index results new
merging css changes from rebecca

Merge branch 'master' into css
merging css
Merge branch 'css'