hollyshit
Merge branch 'master' of https://github.com/pmear/newGitTest

Conflicts:
	commandes.html