Push images combat
Merge branch 'master' of https://github.com/winner-java/javator

Conflicts:
	bin/interfaceGraphique/IHM$AreneJPanel.class