Small tokenizer bug fixes. Output of ./test-t-ok.sh still identical.
Merge branch 'designProject' of https://github.com/nfischer/CS111Lab1 into designProject