Merge branch 'master' of https://github.com/Rapou/OGO_projetBarathon

Conflicts:
	www/css/barathon.css