Commit R.Duda
Merge branch 'master' of https://github.com/kthchatt/Bittorrent

Conflicts:
	announce.c
	announce.h
	regexing.c
	regexing.h
	urlparse.c
	urlparse.h