ignore folder
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
TStMerger v1.1.3
Merge branch 'master' of https://github.com/rupnikj/qminer
TStMerger ver2
TStMerger ver2.1
TStMerger
Fixed unused variable warning
Classify now returns string instead of an index
enabled debug support
Merge remote-tracking branch 'remotes/stopar/master'
js debug
...