pret aux conflits
Merge remote-tracking branch 'origin/master'

Conflicts:

	MyApplication/app/src/main/java/com/example/thibault/myapplication/MainActivity.java
	MyApplication/app/src/main/res/layout/activity_main.xml
	MyApplication/app/src/main/res/values/strings.xml