travail sur collision guichet
Merge branch 'master' of https://github.com/Cellule/PHS4700_Lab

Conflicts:
	Devoir1/simulationA2.m