Merge remote-tracking branch 'origin/style'

Conflicts:
app/assets/stylesheets/css_file_folder/questions.css.scss
app/views/restaurants/show.html.erb