finished proofreading the rest of the document
finished proofreading the rest of the document +
Merge remote-tracking branch 'giannis/master'
Corrections from Giannis

Conflicts:
	pyFAI_JAC.tex