workspace.xml
fixed merge conflicts
Fixed and tested markov data analyser