detection collision bidon
Merge branch 'master' of https://github.com/Cellule/PHS4700_Lab
Merge branch 'master' of https://github.com/Cellule/PHS4700_Lab
tests bidon
Merge branch 'master' of https://github.com/Cellule/PHS4700_Lab
tests bidon 2
asdfwagf
Merge branch 'master' of https://github.com/Cellule/PHS4700_Lab

Conflicts:
	Devoir3/Simulation.m
test avec vrai detection collision