ignore
Merge branch 'master' of github.com:rupnikj/qminer

Conflicts:
	.gitignore