1
1
2
Merge branch 'origin/master'

Conflicts:
	manual.tex