Merge pull request #11 from GreyThompson/development

Merging Development into Master. Automatic merge - no issues.
attempt to fix the fonts
Merge pull request #12 from GreyThompson/gweedsgwap

attempt to fix the fonts