Merge branch 'master' of https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500

# Conflicts:
#	assignments/nbproject/project.xml
#	examples/nbproject/project.xml
#	examples/src/OpenDis7Examples/ExampleSimulationProgram.java
#	examples/src/OpenDis7Examples/ExampleTrackInterpolation.java
#	examples/src/UdpExamples/UnicastUdpSender.java
#	presentations/05_JavaIO_InputOutput_CheatSheet.pptx
#	presentations/06_UDP_UserDatagramProtocol.pptx