serversocket implemented
fixed merge conflicts
fixed some stuff in eyecall aid