this is unstable, don't try to run this commit
Merge branch 'master' of github.com:fgeraci/cs352-bittorrent-project