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

Conflicts:
	src/com/paxos/Main.java