Add Tokyo
Merge branch 'master' of https://github.com/ericleo/git-mania