Contact
Merge branch 'master' of https://github.com/Syst54/UqacSecurite

Conflicts:
	SpyApp/AndroidManifest.xml