classe test
Merge branch 'master' of https://github.com/Xyrodileas/jeu2D

Conflicts:
	.classpath
	src/testClasse/BruncoTest.java