Merge branch 'master' of github.com:TrackYourself/track-yourself into adding-tokens-jc
Merge branch 'adding-tokens-jc'