Merge branch 'master' of https://github.com/rsefer/chicagofood

Conflicts:
app/assets/stylesheets/style.css.scss
Fixed?