Merge pull request #1 from brunobord/master

MAJ
Update README.md
Merge branch 'master' of https://github.com/Natouille/conconf into Natouille-master

Conflicts:
	README.md