Working on tokenif
Merge branch 'master' of https://github.com/brojec/cosc301_proj02