Add token stuff
Merge branch 'master' of github.com:Its-a-Trap/My-Butt