summary

description
Merge branch 'master' of https://github.com/Maarlock/ProjetAifcc

Conflicts:
	README.md