added battle joining
Merge branch 'master' of https://github.com/kdhillon/besiege