change join ver11
Merge branch 'master' of https://github.com/jcslaa/hackathon