...
...
Merge branch 'master' of https://github.com/jmccrae/shimmr.git
Fix logic.cpp so it compiles
Remove temp VS files
Complete CNF conversion (pre-testing)