From b0080ba3b73d84aafc3c570b080741467f759b3b Mon Sep 17 00:00:00 2001
From: Riccardo Spagni <ric@spagni.net>
Date: Wed, 18 Feb 2015 19:44:44 +0200
Subject: [PATCH] added merchant directory

---
 _data/merchants.yml          | 24 ++++++++++++++++++++++++
 getting-started/merchants.md | 30 +++++++++++++++++++++++++-----
 2 files changed, 49 insertions(+), 5 deletions(-)
 create mode 100644 _data/merchants.yml

diff --git a/_data/merchants.yml b/_data/merchants.yml
new file mode 100644
index 00000000..06827c8b
--- /dev/null
+++ b/_data/merchants.yml
@@ -0,0 +1,24 @@
+- category: Exchanges
+  merchants:
+    - name: Poloniex
+      url: https://poloniex.com/exchange/btc_xmr
+    - name: Bittrex
+      url: https://www.bittrex.com/Market/Index?MarketName=BTC-XMR
+    - name: Melotic
+      url: https://www.melotic.com/markets/xmr-btc
+    - name: CoinSwap
+      url: https://coin-swap.net/market/XMR/BTC
+- category: Services
+  merchants:
+    - name: MyMonero Web-based Wallet
+      url: https://mymonero.com
+    - name: XMR.to Monero to Bitcoin Payment Service
+      url: https://xmr.to
+    - name: CryptoEscrow Escrow Service
+      url: http://www.cryptoescrow.eu
+    - name: MoneroClub OTC Monero Trading
+      url: https://www.moneroclub.com/offers/
+- category: Gambling
+  merchants:
+    - name: Crypto Coins Dice
+      url: https://www.cryptocoins-dice.com
diff --git a/getting-started/merchants.md b/getting-started/merchants.md
index e344e61b..7eb55ef8 100644
--- a/getting-started/merchants.md
+++ b/getting-started/merchants.md
@@ -9,8 +9,28 @@ icon: "icon_merchants"
 attribution: "<!-- Icon is based on work by Freepik (http://www.freepik.com) and is licensed under Creative Commons BY 3.0 -->"
 ---
 
-{:.col-lg-3}
-### Exchanges  
-- asd
-- asd
-- asd
\ No newline at end of file
+If there are any merchants that no longer provide Monero services, or a merchant that wishes to be added, please [open an issue on this website's Github repository](https://github.com/monero-project/monero-site/issues) to alert us.
+
+<div class="row">
+
+{% for data_merchants in site.data.merchants %}
+
+<div class="col-lg-4">
+
+<h4 class="text-center">{{ data_merchants.category }}</h4>
+
+<ul>
+
+{% for data_merchant in data_merchants.merchants %}
+
+<li><a href="{{ data_merchant.url }}">{{ data_merchant.name }}</a></li>
+
+{% endfor %}
+
+</ul>
+<hr>
+</div>
+
+{% endfor %}
+
+</div>
\ No newline at end of file
-- 
GitLab