added main to PeerProcess and added some test files for the cfgs
adding changes in order to pulll
:q

Conflicts:
	bin/networking/BasicSocket.class
	bin/networking/Protocol.class
	bin/networking/ProtocolMessage.class
	bin/networking/ProtocolPackage.class
	bin/networking/ProtocolSocket.class
	bin/networking/ThreadedSocket.class
	bin/pseudoTorrent/PeerProcess.class
	bin/pseudoTorrent/networking/Message.class
	bin/pseudoTorrent/networking/TorrentServer.class
	bin/pseudoTorrent/networking/TorrentSocket.class
	src/networking/BasicSocket.java
	src/networking/Protocol.java
	src/networking/ProtocolMessage.java
	src/networking/ProtocolPackage.java
	src/networking/ProtocolSocket.java
	src/networking/ThreadedSocket.java
	src/pseudoTorrent/PseudoTorrent.java
	src/pseudoTorrent/networking/Message.java
	src/pseudoTorrent/networking/TorrentServer.java
	src/pseudoTorrent/networking/TorrentSocket.java
testing push
Merge branch 'master' of https://github.com/cavasquez/PseudoTorrent into Terek
added Tracker
added Tracker and Timer classes
finished Tracking.  still need to test.
finished Tracking.  still need to test.
Merge branch 'Terek', remote-tracking branch 'origin'
removed leftover tracking stuff in networking package
Merge branch 'Terek'
attempting to merge master with Carlos
Create .gitignore
attempting merge
Merge branch 'master' of https://github.com/cavasquez/PseudoTorrent
Added handshake related methods to TorrentSocket. Still needs testing