before oussa
Merge remote-tracking branch 'origin/master'

Conflicts:
	ENISCassiopae/res/layout/activity_carousel_demo.xml
Merge remote-tracking branch 'origin/master'
finay accueil marche