Merge pull request #3 from monero-project/master

_config/nginx.conf

_data/merchants.yml

_includes/header.html

...erview-and-logs-for-the-dev-meeting-held-on-2017-05-21.md

...6-04-logs-for-the-Kovri-dev-meeting-held-on-2017-06-04.md

...6-11-logs-for-the-Kovri-dev-meeting-held-on-2017-06-11.md

...erview-and-logs-for-the-dev-meeting-held-on-2017-06-11.md

_strings_en.yml

knowledge-base/moneropedia/ringCT.md

knowledge-base/user-guides/vps_run_node.md