c
Merge branch 'master' of https://github.com/anserud/ou3.git

Conflicts:
	ou3_rumor/bin/ou3/Message.class
	ou3_rumor/bin/ou3/Network.class
	ou3_rumor/bin/ou3/Node.class
	ou3_rumor/bin/ou3/Position.class
	ou3_rumor/bin/ou3/QueryMessage.class
	ou3_rumor/bin/ou3/Simulator.class
	ou3_rumor/src/ou3/Message.java
	ou3_rumor/src/ou3/Node.java