connerie de modif sans git
Revert "connerie de modif sans git"

This reverts commit d4198397b53a7ea185d7d72069dc367b6f9e615e.
connerie2
Merge branch 'master' of https://github.com/Wilfrite/ProjetPOEC

Conflicts:
	public/images/article/mini_world.jpg
	public/images/article/ram.jpg