Merge branch 'Terek', remote-tracking branch 'origin'
Merge branch 'Terek'
added and tested Logger. Added TorrentLogger which still needs to be tested
attempting to merge master with Carlos
Create .gitignore
attempting merge
Merge branch 'master' of https://github.com/cavasquez/PseudoTorrent
Merge branch 'master' of https://github.com/cavasquez/PseudoTorrent into Terek

Conflicts:
	bin/pseudoTorrent/PeerProcess.class
Updated host