update
Merge branch 'master' of https://github.com/david-amirault/Prog2

Conflicts:
	.DS_Store
	Lab2/.DS_Store
	Lab2/bin/.DS_Store
	Lab2/src/.DS_Store
update