.gitignore
Merge branch 'master' of github.com:aroquemaurel/Lessons-and-doc

Conflicts:
	.gitignore
MCPR TP4