Added structs and functions related to tokens
Merge branch 'master' of github.com:gotonis/gdl-parser
git won't let me push without pulling first