Local
Merge branch 'master' of https://github.com/naveenganapathi/Paxos.git

Conflicts:
	src/com/paxos/common/Process.java
Merge branch 'master' of https://github.com/naveenganapathi/Paxos.git

Conflicts:
	src/com/paxos/common/Process.java
local commit
Merge branch 'master' of https://github.com/naveenganapathi/Paxos.git

Conflicts:
	src/com/paxos/common/Process.java
check in