add s to http on font imports
Merge branch 'master' into heroku

updated heroku branch with master branch
Merge pull request #24 from jsmit032/heroku

Heroku