Merge origin/master

Conflicts:
	.gitignore
	projects/Assignments/2018JulySeptember/homework1/FriscoTcpClient.java
	projects/Assignments/2018JulySeptember/homework1/FurrAssignment2.java
	projects/TcpExample1/build/classes/tcpexample1/TcpExample.class
	projects/TcpExample1/nbproject/private/private.properties
	projects/TcpExample1/nbproject/private/private.xml
	projects/TcpExample2/build/classes/tcpexample2/TcpExample2.class
	projects/TcpExample2/nbproject/private/private.properties
	projects/TcpExample2/nbproject/private/private.xml