Change proxy, add markdown
Merge branch 'master' of https://github.com/ViciousPotato/.emacs.d