merge upstream#13

holgern merged 8 commits into

holgern:btcguide-pandocholgern/btcguide.github.io:btcguide-pandocfrom

btcguide:masterbtcguide/btcguide.github.io:masterCopy head branch name to clipboard