Rectification
Merge branch 'master' of http://github.com/cphyc/Von_Karman

Conflicts:
	presentation/fichier.tex