working on join game
Merge branch 'master' of github.com:255/catan
Merge branch 'master' of github.com:255/catan
working on join problems