Merge remote-tracking branch 'upstream/master'
Change TachyFon to TachyFont
Merge remote-tracking branch 'upstream/master'
Merge pull request #307 from bstell/master

Change TachyFon to TachyFont