Intermediary commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	Project1/src/NetworkMain.java
Minor change
Implemented most of the code for part D. Having a problem listening for
a response though.