MultiPaxos
Merge branch 'master' of https://github.com/yingdaluo/SmartMap.git

Conflicts:
	SmartMap/src/paxos/Acceptor.java