running on windows
Merge branch 'master' of https://github.com/baylesj/cs325.git