Merge origin/master

Conflicts:
	README.md

assignments/src/MV3500Cohort2022MayJune/homework2/Duran/DuranTcpExample3Client.java

@@ -3,10 +3,7 @@ import MV3500Cohort2021JulySeptember.homework2.Domonique.*;
 import java.io.*;
 import java.net.*;
 
-/**
- * Hey why not say what this thing does...
- * @author Dom Hittner
- */
+
 public class DuranTcpExample3Client {
 
     /** IPv6 String constant for localhost address, similarly IPv4 127.0.0.1

assignments/src/MV3500Cohort2022MayJune/homework2/Duran/DuranTcpExampleServer.java

@@ -4,10 +4,7 @@ import MV3500Cohort2021JulySeptember.homework2.Domonique.*;
 import java.io.*;
 import java.net.*;
 
-/**
- * homework assignment
- * @author Dom Hittner
- */
+
 public class DuranTcpExampleServer {
 
     /**
@@ -44,7 +41,7 @@ public class DuranTcpExampleServer {
                     // Now hook everything up (i.e. set up the streams), Java style:
                     os = clientConnectionSocket.getOutputStream();
                     ps = new PrintStream(os);
-                    ps.println("okay " + serverLoopCount + " let's go to Starbucks"); // this gets sent back to client!
+                    ps.println("now " + serverLoopCount + " i am connected"); // this gets sent back to client!
                     
                     // Print some information locally about the Socket connection.
                     // This includes the port and IP numbers on both sides (the socket pair).

assignments/src/MV3500Cohort2022MayJune/homework2/Marks/MarksTcpExample3Client.java

@@ -4,10 +4,7 @@ import MV3500Cohort2021JulySeptember.homework2.Domonique.*;
 import java.io.*;
 import java.net.*;
 
-/**
- * Hey why not say what this thing does...
- * @author Dom Hittner
- */
+
 public class MarksTcpExample3Client {
 
     /** IPv6 String constant for localhost address, similarly IPv4 127.0.0.1

assignments/src/MV3500Cohort2022MayJune/homework2/Marks/MarksTcpExampleServer.java

@@ -5,10 +5,7 @@ import MV3500Cohort2021JulySeptember.homework2.Domonique.*;
 import java.io.*;
 import java.net.*;
 
-/**
- * homework assignment
- * @author Dom Hittner
- */
+
 public class MarksTcpExampleServer {
 
     /**