Update merchants.yml

fix broken links merchants.yml + what-is-monero

Update merchants.yml

Logs for the Kovri and Dev meetings held on 2016-06-25

[urgent] Fix user-facing broken forum links

Removing broken link to rocket.xmrnation.com

Fix wrong link to Stackexchange

Fix FAQ typo

typo fix

c57d24fb Update index.md (SamsungGalaxyPlayer)

3d601126 fix a quick typo (sirneb)

70255b6d Reverted FFS links (rehrar)

- Reverted link in Contributing to forum.getmonero.org
- Reverted header links to forum.getmonero.org

79c3d971 Updated README (rehrar)
4e41a6a0 Added new site (rehrar)
3c3d0698 Removed old site (rehrar)

- Removed or restructured some old instructions
- Added instructions on how to edit various parts of the website

Shouldn't Crypto Kingdom be dropped from the directory? #283
Add Store to Merchant list #285
Two more exchangers #275
Please add Nutritional Therapy Services to Good and Services #259

Merge recent changes

ce311c23 updated merchants list and fixed broken links (erciccione)

84da8394 Add link to GitHub from menu (Robby Weinberg)

2ba634c6 updated RingCT obsolete description (erciccione)

5fa27614 Logs for the Kovri meetings held on 2017-06-04 + 2017-06-11 and logs for the Dev meeting held on 2017-06-11 (dEBRUYNE-1)
45ce311e Logs for the Dev meeting held on 2017-05-21 (dEBRUYNE-1)

bf3b95c0 automatic security (tokjingga)

e91cfc6c Removing broken link to Rocket Chat rocket.xmrnation.com (Jonathan Cross)

Logs for the Kovri meetings held on 2017-06-04 + 2017-06-11 and logs for the Dev meeting held on 2017-06-11