Fichiers à ignorer
Merge branch 'master' of https://github.com/Archi-Strasbourg/archi-wiki

Conflicts:
	.gitignore
Merge remote-tracking branch 'origin/dev'
Merge remote-tracking branch 'origin/dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Doublon
Licence correcte