Added multiclient support to the server and client

Signed-off-by: Oscar Suro <outercript@gmail.com>
Removed includes that are not longer needed

Signed-off-by: Oscar Suro <outercript@gmail.com>