Merge remote-tracking branch 'origin/master'

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

Ajout leroux + observateur + target + poursuite
 merge
Merge branch 'master' of https://github.com/Noitacinrofilac/CPO_Project