marche ap
Merge branch 'master' of https://github.com/MickaWell/cours-wp

Conflicts:
	wp-content/themes/module_woo/woocommerce.php