added timers for choking and optimistic unchoking
Merge branch 'master' of https://github.com/evanbbass/PoopTorrent