Merge branch 'master' of https://github.com/robin-cominotto/javaProject2TI

Conflicts:
	README.md