commit needed

no changes
Merge branch 'master' of https://github.com/Sukram21/LOG635_labo3

Conflicts:
	.gitignore