Progress
Try
Merge branch 'master' into Gal
working on joinSession
Merge branch 'master' into Gal
working...
Merge branch 'master' into Gal
seperated joinSession from recording
Arranged joinSession.php