toe truck
Merge branch 'master' into feature/donations-ui

* master:
  Adding commits from Neil Patrick Harris #likeaboss
  Another PayPal logo
  Testing advanced button
  Testing simple donate button
  Testing a donate short code
  Optimized images
  Logos for PayPal customization
Progress
IT WORKS
We have a working donations UI that also conditionally loads the sidebar if there are donations set in the admin area.
Merge branch 'master' into feature/donations-ui

* master:
  reverting the last commit
  Better responsive carousel
  Responsive carousel
  Handle variable months
  Offer MarinLink, Simple, and Advanced donation options
  Better donate styling
  minor CSS tweaks
  Better layout
  Better layout
  Stylize the <select>
  CSS update for contact form radio buttons
  added some CSS for radio buttons on contact form
  added contact form and other misc CSS
  Safe jQuery
  Advanced PayPal payment form
  Using bigger logo

Conflicts:
	assets/css/mission-atletica.css
	functions.php
Merge branch 'feature/donations-ui'

* feature/donations-ui:
  We have a working donations UI that also conditionally loads the sidebar if there are donations set in the admin area.
  IT WORKS
  Progress
  toe truck