Merge branch 'master' of heroku.com:hotlynx into dev
Merge branch 'master' into dev
removed external font call
Merge branch 'dev'