Small changes that hopefully won't conflict with the last 3.
Merge branch 'master' of https://github.com/AwwSum/SocketsInterface.git

Conflicts:
	src/Main.java