add stuff
Merge branch 'master' of https://github.com/Educ8-2014/educ8-angular into feature/60-screenshare
fix stuff
room fix#1
Merge branch 'master' of https://github.com/Educ8-2014/educ8-angular into feature/60-screenshare
Merge branch 'feature/60-screenshare'