readme
Merge branch 'master' of https://github.com/ebuchman/minimum_probability_flow

Conflicts:
	README.md