Updated client and server
Made minor changes
Resolved Conflicts