Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore

Revert "Salut !"

This reverts commit
70a09a8f60ac70e48f5a8e70406301c028aed210.