Merge branch 'mayenjoy-master'

well, seems this script wont work on windows

Author: csrgxtu

src/main.py

@@ -43,6 +43,7 @@ def run(self):
 
     for p in processes:
       p.join()
-    
-m = main('../data/ips.txt', '../data/ipsok.txt')
-m.run()
+
+if __name__ == '__main__': 
+	m = main('../data/ips.txt', '../data/ipsok.txt')
+	m.run()