Conflicts:
	lib/Http.coffee
	package.json