ajout jeton sur la grille
Merge branch 'master' of https://github.com/Archilog2013/jygo

Conflicts:
	.gitignore
	src/main/webapp/index.html