Merge branch 'master' into invite_rooms
Finished adding private room functionality
Merge branch 'invite_rooms'