Merge branch 'master' into patch-1

.ruby-version

Gemfile

Gemfile.lock

README.md

_data/merchants.yml

_includes/header.html

_strings_en.yml

get-started/mining/index.md

get-started/what-is-monero/index.md

index.html

resources/user-guides/importing_blockchain.md

resources/user-guides/index.md

...es/user-guides/png/remote_node/remote-node-screenshot.png

resources/user-guides/png/solo_mine_GUI/01.PNG

resources/user-guides/png/solo_mine_GUI/02.PNG

resources/user-guides/png/solo_mine_GUI/03.PNG

resources/user-guides/prove-payment.md

resources/user-guides/remote_node_gui.md

resources/user-guides/solo_mine_GUI.md

resources/vrp/index.md