Solving problem with '
Merge branch 'master' of https://github.com/mmunos/descriptive

Conflicts:
	sharp-sigma-one-plus.tex