hummus and peer.py
Merge branch 'master' of github.com:jschonberg/Hummus-Bittorrent-Client
Work in progress
Merge branch 'master' of github.com:jschonberg/Hummus-Bittorrent-Client

Conflicts:
	peer.py