Heartbeat Merge (in progress)
Merge branch 'master' of https://github.com/gamoholic010/DistributedSystems

Conflicts:
	edu.cmu.ds.lab1/src/network/Client.java
	edu.cmu.ds.lab1/src/network/Server.java
	edu.cmu.ds.lab1/src/processmanager/ProcessManager.java