lastModif
Merge branch 'master' of https://github.com/Khalife/PGM-project

Conflicts:
	Short_prestentation.tex