??
Merge branch 'master' of github.com:samuelaustin/randomized_algorithms_1

Conflicts:
	src/mr.cpp
	src/rand