fonts included
merged, resolved conflicts
fonts applied
Merge pull request #7 from argonauthills/master

fonts applied