pushing ternary change
Merge branch 'master' of https://github.com/hwhalen/naught_compiler