strips out server
adds wind
adds a simple socket implementation
merges conflicts