updated fonts and some other stuff
conflicts reconciled
Merge pull request #8 from Dawenster/windows2

Windows2