update
Merge remote-tracking branch 'origin/master'

Conflicts:
	manuscript/Book.txt