windows updates and stuff
Merge branch 'master' of https://github.com/Dawenster/inflationatr into windows2
Merge pull request #9 from Dawenster/windows2

Windows2