Fixed Gemfile conflicts

Fixed Gemfile conflicts
Merge branch 'master' into Add-HTML-CSS-Pages
Added Food and Recipe Pages and Fixed navbar

- Added Food Page
- Added Recipe Page
- Fixed navbar so that the correct link is “highlighted”
  so the user knows which page they are on.