matrix added
Merge branch 'matrix' into ngram-states
adapting matrix, starting to include in MarkovModel