Intermediate commit. Attempting to integrate heartbeat detector.

Man, coffee is the best. Seriously.
Merge branch 'master' of https://github.com/jcmcclurg/ECE428

Conflicts:
	MP1/mcast.cc