fix calcul_Y
Merge branch 'guillaume/joueur'
feature collision *
Merge branch 'clement/projectileCollision' into guillaume/joueur

Conflicts:
	jeu.py
Merge branch 'clement/projectileCollision' into guillaume/joueur

Conflicts:
	jeu.py
Merge branch 'guillaume/joueur' into clement/projectileCollision
fix collision

(bord rouge)
stub gestion colision
fix projectionCollision
Merge branch 'clement/projectileCollision'
Merge remote-tracking branch 'origin/master'