working on id madness
Merge branch 'master' of https://github.com/GeneClint/NaughtCompiler
fixed merge errors