Conflicts:
	lib/WebSocket.coffee