Seb vendredi 13/06 16h23
Seb 16h28
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/RelationsPubliques/Global.java