test
p2p test
Merge branch 'master' of https://github.com/msmolle/swa

Conflicts:
	swazam-peer/src/main/java/org/tuwien/swalab2/swazam/peer/Peer.java