draft refactoring
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/document.tex
Merge remote-tracking branch 'origin/master'