Get Proxy and cache proxies
Added proxies.txt
Fixed conflict
Merge remote-tracking branch 'origin/master'