Merge branch 'timeout' of https://github.com/yifan-gu/epaxos into merge-timeout

Conflicts:
	replica/replica.go