rédaction pb 3
Merge branch 'HEAD' of https://github.com/lfaucon/cs450.git

Conflicts:
	homework1/homework.log
	homework1/homework.pdf