Renamed Ping to Heartbeat
Renamed heartbeat and request server variables in Server.java for clarity
Merge branch 'master' of github.com:rockyhe/rockykevinleon

Conflicts:
	eece411/phase2/src/phase2Pack/Server.java