Merge origin/master

Conflicts:
	src/markovchain/MarkovChain.java