Added back in original server and client files.  Library works with c versions.
Resolved merge conflicts.