Remove useless files
Merge remote-tracking branch 'origin/newFeature' into trop-cool

Conflicts:
	README.md
some rename
Merge branch 'conflict'

Conflicts:
	README.md
Merge branch 'master' of github.com:Calixte/flaming-bear

Conflicts:
	README.md