added font to link_tag
Merge branch 'master' into authenticate
fixed conflict