COUCOU
COUCOU
Merge remote-tracking branch 'origin/master'

Conflicts:
	MyApplication/app/src/main/java/com/example/guillaume/myapplication/MyActivity.java
COUCOU