Merged some demo stuff
Merge branch 'master' of https://github.com/geertvos/gossip.git

Conflicts:
	Gossip/gossip-demo/src/main/java/net/geertvos/gossip/demo/ExtraMemberApplication.java