added socks proxy
Merge branch 'master' of github.com:jintonic/jintonic.github.io