fixed header
Merge branch 'master' of github.com:kalbooks/kalboko
added join locations
Merge branch 'master' of github.com:kalbooks/kalboko