rejoin game you're in
oops
Merge branch 'biggs'