writing
Synchronizing
Corrected a few errors
some work
Merge remote branch 'pierre/master'

Conflicts:
	biblio.bib