fixed render bug
Merge branch 'mark' of github.com:rossetti211/thrive
fixed join button
fixed rendering bug
moved tick to server
Merge branch 'master' into mark