correction divers

Conflicts:
	.gitignore