cf text
Merge branch 'master' of https://github.com/birkhoff/vps

Conflicts:
	MapReduce/cf.txt
updated README