ala
lapinMerge branch 'master' of https://github.com/ChristianHiroz/NuitInfoMiageNanterre

Conflicts:
	.idea/workspace.xml