YO
Merge branch 'master' of https://github.com/NicolasRichard/Team9

Conflicts:
	AndroidManifest.xml