Merge pull request #40 from akjohnson/production
Merge pull request #43 from akjohnson/production

Events, othersites, donations/subscriptions
Merge pull request #48 from akjohnson/production

Production
Merge pull request #50 from akjohnson/production

Indiegogo home page
Merge pull request #51 from akjohnson/production

Add Dwolla button to donations
Merge pull request #52 from akjohnson/production

Add membership page using text from Frances
Merge pull request #53 from akjohnson/production

Change fundraising campaign to reflect stretch goals
Upgrade to Foundation 5
Fix Foundation javascript
Start making color changes
Merge pull request #57 from akjohnson/production

Update the front page in a temporary new styling
Merge pull request #58 from akjohnson/production

Upgrade to Foundation 5
Merge pull request #59 from akjohnson/master

Let's just keep master as production and not make it too complicated
Merge pull request #60 from SeattleAttic/production

Trying to sync up master and production
Add in basic mailchimp integration
Change over subscribe to announcements link
Merge pull request #63 from akjohnson/mailinglist

Mailinglist
Fix missing </ol>
Merge branch 'master' into develop

Conflicts:
	HedyNet/HedyNet/urls.py
	HedyNet/foundation_static/js/vendor/zepto.js
	HedyNet/scss/site/_overrides.scss
	HedyNet/scss/site/base.scss