Merge branch 'master' into master

.ruby-version

CONTRIBUTING.md

Gemfile

Gemfile.lock

README.md

_data/merchants.yml

_data/team.yml

_includes/header.html

...sclosure-of-a-major-bug-in-cryptonote-based-currencies.md

...7-09-logs-for-the-Kovri-dev-meeting-held-on-2017-07-09.md

...erview-and-logs-for-the-dev-meeting-held-on-2017-07-09.md

...7-16-logs-for-the-Community-meeting-held-on-2017-07-16.md

...7-23-logs-for-the-Kovri-dev-meeting-held-on-2017-07-23.md

...erview-and-logs-for-the-dev-meeting-held-on-2017-07-23.md

...7-30-logs-for-the-Community-meeting-held-on-2017-07-30.md

...8-06-logs-for-the-Kovri-dev-meeting-held-on-2017-08-06.md

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

...8-13-logs-for-the-Community-meeting-held-on-2017-08-13.md

_strings_en.yml

community/hangouts/index.md