mise jour
mise ajourMerge branch 'master' of p2chpd-login1.univ-lyon1.fr:~/CANUM2014

Conflicts:
	CANUM2014.ipynb