Merge branch 'master' into text-revisions-0

.gitignore

.ruby-version

Gemfile

Gemfile.lock

README.md

_data/downloads.yml

_data/irc.yml

_data/merchants.yml

_includes/footer.html

_includes/header.html

_layouts/ffs-cp.html

_layouts/ffs-fr.html

_layouts/ffs-ideas.html

_layouts/ffs-ot.html

_layouts/ffs-wip.html

_layouts/post.html

...erview-and-logs-for-the-dev-meeting-held-on-2016-03-05.md

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

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

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