modification mineurs de la gestion des collision
Merge branch 'master' of https://github.com/Dalan94/Super_Martin

Conflicts:
	Super_Martin/src/enemies.c