Client updated-ish to handle ICMP
Merge branch 'master' of https://github.com/geiselc/Project4