first commit
Essai
Merge branch 'master' of https://github.com/Klomak/inf560

Conflicts:
	README.md