t
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	projet/pom.xml
	projet/src/main/java/main/Main.java