add sockets for client side
Merge branch 'master' of https://github.com/skatinsam/ICS168-Swarch-

Conflicts:
	SwarchServer/SwarchServer.v11.suo