chang
Merge branch 'master' of https://github.com/ejharriso/cs417_bittorrent_client

Conflicts:
	client.c
	tracker.c