conflits
Merge branch 'master' of https://github.com/cyndi90/memoire

Conflicts:
	doc/chap1.tex