fix conflict
Merge branch 'master' of https://github.com/pedrohfsd/geoLearning
weka arff generator