second commit from ring
Merge branch 'master' of https://github.com/patim/QNM

Conflicts:
	QNM.tex
another commit from ring