f
Merge remote-tracking branch 'origin/master'

Conflicts:
	MyApplication/app/src/main/res/layout/activity_main.xml
qsdfghjklmù
finalisation
ajout marges courbes top & right
Merge remote-tracking branch 'origin/master'

Conflicts:
	MyApplication/app/app.iml
	MyApplication/app/src/main/res/layout/activity_main.xml
	MyApplication/app/src/main/res/values/strings.xml