ctrl + shift + f
Merge branch 'master' of https://github.com/dhawalseth/Gossip_MP.git

Conflicts:
	Gossip_MP2/src/gossip/heartbeat/HeartBeatTable.java