texte
Merge branch 'master' of https://github.com/chrysler76/logoergo

Conflicts:
	css/styles.css