Distributions
Merge branch 'master' of github.com:merlinND/randomness-and-probability

Conflicts:
	Makefile