added join button
error massages added
Merge pull request #1 from yahani/master

p1