Ring change
Merge branch 'master' of https://github.com/mpwoz/cs425-mp3 into HEAD

Conflicts:
	ring/ring.go
Merge branch 'master' of https://github.com/mpwoz/cs425-mp3 into HEAD

Conflicts:
	ring/ring.go
	ring/tcp_funcs.go