join error
Merge branch 'master' of https://github.com/lancelotnull/ting
125