Small changes.
Merge remote-tracking branch 'origin/master'

Conflicts:
	assignm_11/assignment11.tex