Merge des branches classes et master.
Conflicts:
	test.txt