Merge branch 'master' of /home/john/Dropbox/Programmering/prosammgen with conflicts.
added a weight parameter to training markov chain
Merge remote-tracking branch 'origin/master'