Bouton Jules Duvivier
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/modules.xml
	app/src/main/res/values/strings.xml
	build/intermediates/model_data.bin
	local.properties
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/ingesup/test/MyActivity.java
	local.properties