ips all around
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	src/com/company/DirectoryServer.java
	src/com/company/P2PClient.java
	src/com/company/ServerRecord.java