merged
Merge branch 'master' of git@github.com:paulollivier/java-project.git

Conflicts:
	src/fr/upem/java_advanced/project/Main.java