modified:   Mblog/src/ClientMessageHandler.java
	modified:   Mblog/src/Replica.java
Merge branch 'master' of https://github.com/victorzakhary/paxos

Conflicts:
	Mblog/bin/ClientMessageHandler.class
	Mblog/bin/Replica.class
	Mblog/src/ClientMessageHandler.java
	Mblog/src/Replica.java

fixing conflict
	modified:   Mblog/bin/Replica.class
implementing interserver communication
Merge branch 'master' of https://github.com/victorzakhary/paxos

Conflicts:
	Mblog/bin/MessageCommunication.class