removed unneeded directory
Merge branch 'with_proxy'
fetch URL without proxy
Merge branch 'master' into with_proxy

Conflicts:
	main.py