Readme question 2
Merge branch 'master' of github.com:legauchy/tp4CSE

Conflicts:
	README.md