Main test
Merge remote-tracking branch 'origin/master'

Conflicts:
	gti310/tp4/Main.java