added fontsquirrel fonts
fixed merge conflict