Test merge with dons mods
Merge pull request #11 from RonPasquarelli/master

Test merge with dons mods
Merge remote-tracking branch 'upstream/master'
refresh merges on windows as opposed to mac osx
Merge pull request #12 from RonPasquarelli/master

refresh merges on windows as opposed to mac osx
Merge remote-tracking branch 'upstream/master'