main.h & engine.h merged
Whitespace violations fixed
Makefile improved
Tricky macro gotochar() rewritten to function