Touche combat + bloc ralentisseur
Merge branch 'master' of https://github.com/guinardA/PolyHogg

Conflicts:
	PolyHogg-desktop/src/com/PolyHogg/view/GameScreen.java