gitignore
Merge branch 'master' of github.com:Cliko/Projet-XP

Conflicts:
	.gitignore