ignore folder
Merge branch 'master' of https://github.com/rupnikj/qminer
Changed name of parameter from "const" to "val" in constant feature extractor (qminer_ftr.cpp).
Merge branch 'master' of https://github.com/rupnikj/qminer
Merge branch 'master' of https://github.com/qminer/qminer
Merge branch 'master' of https://github.com/rupnikj/qminer
Merge branch 'master' of https://github.com/qminer/qminer
Merge branch 'master' of https://github.com/qminer/qminer
Merge branch 'master' of https://github.com/qminer/qminer
Merge branch 'master' of https://github.com/rupnikj/qminer
Merge branch 'master' of https://github.com/rupnikj/qminer
Merge branch 'master' of https://github.com/rupnikj/qminer
Merge branch 'master' of https://github.com/rupnikj/qminer
Merge branch 'master' of https://github.com/rupnikj/qminer

Conflicts:
	.gitignore
StMerger
TStMerger javascript
TStMerger ver1.1
Merge https://github.com/mihapapler/qminer
TStMerger ver1.1.1
TStMerger ver1.1.2