Carolina's updates
Merge branch 'master' of github.com:rupnikj/nipsQMiner

Conflicts:
	qminer.tex
Updated poster