for merge?
add tramp?
init.el:fixed proxy?
Merge branch 'develop' w/o no-think
init.el:re-removed proxy, .gitignore:wget-log