First Commit
Merge https://github.com/jdong92/socket