norme
Merge branch 'master' of github.com:raviluminy/gk

Conflicts:
	Soutenance/CDCF_Norme.tex