Daily Scrum daily_scrum_thibault_riou_08_10
Merge branch 'master' of https://github.com/PixelSenseEnib/PixelSense

Conflicts:
	Scrum Master/Doc/Daily Scrum/daily_scrum_thibault_riou_08_10.odt