cleanup preprocessor
whitespace
Merge branch 'master' of https://github.com/Draradech/NewtonWars