merged
Merge branch 'master' of https://github.com/laurabreiman/markov-chain

Conflicts:
	markov.js