Deleted test swing code and now runs both client and server
Fixing merge conflicts