merged master
a separate build file for windows compiles and runs all the tests successfully
we're building an exe that is somehow failing