merge h
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/CommandeOrdinateur.js
Merge branch 'master' of https://github.com/Noitacinrofilac/CPO_Project
Merge branch 'master' of https://github.com/Noitacinrofilac/CPO_Project
ajout land
Merge remote-tracking branch 'origin/master'
Modifications pour collision
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/myPhysics.js
	js/player.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/myPhysics.js
	js/player.js

Ajout leroux + observateur + target + poursuite
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/myPhysics.js
	js/player.js

Ajout leroux + observateur + target + poursuite