Merge pull request #36 from roosmaa/update-merchants

Update merchants directory

_data/merchants.yml

@@ -1,36 +1,56 @@
 - category: Exchanges
   merchants:
-    - name: Poloniex
+    - name: "#monero-otc (OTC)"
-      url: https://poloniex.com/exchange/btc_xmr
+      url: https://webchat.freenode.net?channels=%23monero-otc
     - name: Bittrex
       url: https://www.bittrex.com/Market/Index?MarketName=BTC-XMR
-    - name: Melotic
+    - name: Bter
-      url: https://www.melotic.com/markets/xmr-btc
+      url: https://bter.com/
+    - name: HitBTC
+      url: https://hitbtc.com/
+    - name: MoneroClub (OTC)
+      url: https://www.moneroclub.com/offers/
+    - name: Poloniex
+      url: https://poloniex.com/exchange/btc_xmr
+    - name: ShapeShift (instant)
+      url: https://shapeshift.io/
 - category: Block Explorers
   merchants:
+    - name: ChainRadar
+      url: http://chainradar.com/xmr/blocks
     - name: MoneroBlocks
       url: http://moneroblocks.eu
 - category: Tools
   merchants:
-    - name: MoneroPric.es Price Converter
-      url: https://moneropric.es
     - name: ForkGuard Network Monitoring
       url: http://forkguard.com
     - name: MoneroBase Price Charts and Tools
       url: http://monerobase.com
+    - name: MoneroPric.es Price Converter
+      url: https://moneropric.es
+    - name: MoneroPrice.com Price Converter
+      url: http://moneroprice.com/
 - 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: Pradeep Atluri, Psychiatrist, New York
-      url: http://dr.mindsci.com/
     - name: CryptoEscrow Escrow Service
       url: http://www.cryptoescrow.eu
-    - name: MoneroClub OTC Monero Trading
+    - name: CryptoName OpenAlias Registry
-      url: https://www.moneroclub.com/offers/
+      url: https://cryptoname.co/
+    - name: MyMonero Web-based Wallet
+      url: https://mymonero.com
+    - name: Pradeep Atluri, Psychiatrist, New York
+      url: http://dr.mindsci.com/
+    - name: XMR.link OpenAlias Registry
+      url: https://www.xmr.link/
+    - name: XMR.to Monero to Bitcoin Payment Service
+      url: https://xmr.to
 - category: Goods
   merchants:
     - name: Cryptonic Physical Monero & Bitcoin coins
       url: https://cryptonic.net
+- category: Entertainment
+  merchants:
+    - name: Crypto Kingdom (MMO)
+      url: http://cryptokingdom.wikia.com/wiki/Crypto_Kingdom_Wiki
+    - name: SafeDice (gambling)
+      url: https://safedice.com/

getting-started/merchants.md

@@ -35,4 +35,4 @@ attribution: "<!-- Icon is based on work by Freepik (http://www.freepik.com) and
 
 </div>
 
-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.
+All of the merchants are organised alphabetically. 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.