changed to windows
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
hopefully this fixes the merge conflict problem
Merge pull request #2 from Hartman2/master

Changed to windows