merge /font and /fonts dirs
Merge pull request #16 from Hippyjake/master

merge /font and /fonts dirs