Stuff
Merge branch 'master' into Rosbel
merge
Revert b4cb5ec..fe55876

This rolls back to commit b4cb5ec03df6b5f28aa34755b58ce880f1a7ae16.
Merge branch 'master' into Rosbel

Conflicts:
	src/project3/SocketClient.java
Revert b4cb5ec..dbc86a9

This rolls back to commit b4cb5ec03df6b5f28aa34755b58ce880f1a7ae16.
Rollback
Merge branch 'Rosbel'