- typographical error
Merge remote-tracking branch 'upstream/master'

Conflicts:
	vault/2-ha5-3mofm/question.tex
Merge pull request #425 from adamarla/master

typo