enchainement de parties
Merge branch 'master' of github.com:ArnaudPanaiotis/m2_ihm_atlanteine

Conflicts:
	site/js/logged.js