modif sur ma branche
Merge branch 'master' of github.com:ebonal/Android_RAE

Conflicts:
	newfile.txt