More http stuff
Merge branch 'master' of github.com:petergp/DistributedSystems

Conflicts:
	Node.js