解决合并冲突,并实现种子junit单元测试

Change-Id: Ifff1a63aed76b380ea4767a1e6e1f31f3e9c0882
diff --git a/torrent/1.torrent b/torrent/1.torrent
new file mode 100644
index 0000000..ddc65f2
--- /dev/null
+++ b/torrent/1.torrent
@@ -0,0 +1 @@
+d7:comment23:ThunderHub pt ?????????4:infod6:lengthi135576e4:name30:upload-6392211665353547601.tmp12:piece lengthi524288e6:pieces20:Ãwè‚2 °ùàó‚˜è0ï†7:privatei1e6:source16:[RKT] thunder ptee
\ No newline at end of file