added trace to tokens
Merge branch 'master' of https://github.com/zaaras/CSC467