Initial commit
solve the conflict
add .DS_Store to .gitignore
Merge branch 'master' of github.com:87boy/interaction
modify join/join.html