minor
Merge branch 'master' of https://github.com/rupnikj/nipsQMiner

Conflicts:
	qminer.tex