Committing before pulling for the merge.

The only changes so far should be what we changed on friday.
Fixed merge conflict: only change was to the port.
Merge branch 'master' of https://github.com/dergemkr/Network-Security-Project

Conflicts:
	pex.py
Merge branch 'master' of https://github.com/dergemkr/Network-Security-Project
Added Peer exchange functionality.

Peer exchange occurs every 20 seconds, and tested for up to 3 peers.