Removed set-tracker command; just edit the properties file to change the tracker address.
Added peer port property (try saying that 5 times fast) to client.
Started waiting for a peer connection when trying to download a file.
Merge remote-tracking branch 'origin/master'

Conflicts:
	server/src/com/cs5600/server/Server.java