struggling with tokenizer
Merge https://github.com/abellj01/sp2-cw2-2014