presentation finished
Merge branch 'master' of https://github.com/liyongsea/Compare_patches

Conflicts:
	doc/presentation/presentation.tex