Cool commit
TEST
config
Merge branch 'master' of https://github.com/fredmontet/projet_mi

Conflicts:
	.gitignore