style
Merge remote-tracking branch 'upstream/master'
Merge pull request #7 from Melindrea/master

Fixing the fonts