sada
Merge branch 'master' of https://github.com/Cellule/PHS4700_Lab

Conflicts:
	Devoir1/devoir1.m
Merge branch 'master' of https://github.com/Cellule/PHS4700_Lab
integration gui 1
Merge branch 'master' of https://github.com/Cellule/PHS4700_Lab