daily scrum
Merge branch 'master' of https://github.com/PixelSenseEnib/PixelSense