removing nohups from repo
Merge branch 'master' into multiRooms
multi rooms ready?