no message
Merge branch 'master' of https://github.com/Lakio21/Colossal-Java-Project

Conflicts:
	ProjetJava/src/projetjava_2/presentation/mainViewController.java