je merge avec Lorène le style à O1h48
Merge branch 'master' of https://github.com/no-feature/up_pen_down
Merge branch 'master' of https://github.com/no-feature/up_pen_down

Conflicts:
	TEX/styles.tex