tweaks
Merge branch 'master' of https://github.com/rehfeldchris/cs153
add unary plus fix choice conflicts. add more tests. refactor some productions. while loop and switch not working