updating charge page
Merge branch 'master' of github.com:reInteractive/exec-io
Merge branch 'master' of github.com:reInteractive/exec-io
Merge branch 'feature/site-design-2' into develop
Fix resize after changing to doc ready
Version bump to 1.0.0
Merge branch 'release/1.0.0'

Conflicts:
	app/assets/images/stillalive-logo.png
	app/assets/stylesheets/home.scss
	app/views/home/charge.html.erb
Removing old image
Expiring assets
Adding unicorn to production
Adding gem rails_12factor
Fix error in not using image_tag helper
updated logomark on images sitewide, added styles for links on about panels, updated layout, updated bootstrap classes