Heartbeating change
Merge branch 'master' of https://github.com/khshah3/cs425-mp4

Conflicts:
	ring/ring.go