no message
Merge branch 'master' of https://github.com/LaZyFiZz/ProjetA2Java

Conflicts:
	test.txt