Merge branch 'master' of mojotrollz.eu:college

Conflicts:
	ws2012/P2P/uebungen/4/src/peer/Node.java

ws2012/P2P/uebungen/4/src/peer/Node.java

@@ -212,7 +212,7 @@ public class Node {
 							break;
 
 						case MessageType.LEAVE:
-							LOGGER.info(receivedFrom.toString()
+							LOGGER.info(name + ": " + receivedFrom.toString()
 									+ " is leaving. Deleting...");
 							neighbors.remove(receivedFrom);
 							break;
@@ -273,6 +273,7 @@ public class Node {
 									+ " received unknown command from "
 									+ receivedFrom.toString() + ": "
 									+ new String(buf.array()));
+							
 						}
 					} else {
 						try {
@@ -285,7 +286,6 @@ public class Node {
 				} catch (IOException e) {
 					e.printStackTrace();
 				}
-
 			}
 		}