modification du style des blocs
Merge branch 'master' of https://github.com/motoi75/em_project

Conflicts:
	assets/css/style.css
modification du style et supression de .htaccess du commit