kjh
commit
Merge branch 'heroku-fonts'

Conflicts:
	app/assets/stylesheets/custom.css.scss
	public/assets/application-acdcf5cece0449fe48abda3cb1581e36.js.gz
	public/assets/application-fd509b2556422a0253b743ee3ea6d49c.js.gz
	public/assets/manifest-e17e1191571ccb83379b574cec7a3c00.json
fff
Merge branch 'master' of https://github.com/jcgasche/payonesnap