test
Merge branch 'master' of https://github.com/Mzartek/Jeu_echecs

Conflicts:
	ressources/test