improved test program
added the stuff from the grammar errors nigel emailed us about.
possible nested comments solution?
made -tokens actually work
Merge branch 'master' of https://github.com/nguillemot/csc435