Commit resolution merge
Merge branch 'master' of https://github.com/Neomac/LO43_Projet.git

Conflicts:
	src/main.java