fixed bug
Merge branch 'master' of https://github.com/SquawMaqaw/Maqaw-Client
screensharing
Merge branch 'master' of https://github.com/SquawMaqaw/Maqaw-Client into screenshare
Merge pull request #54 from CalvinFernandez/screenshare

Screenshare