Merge pull request #437 from sevengali/sevengali-matrix

Matrix protocol / Riot.im client

index.html

@@ -225,7 +225,6 @@
 <div class="page-header text-center">
 <h1>Privacy-Respecting Search Engine</h1>
 </div>
-
 <p>
 <img src="img/layout/privatesearch.png" class="center-block img-responsive" alt="privatesearch.io">
 </p>
@@ -238,12 +237,9 @@
 </span>
 </div>
 </form>
-
 <p></p>
-
 <p class="text-center text-muted">example search: <a href="https://www.privatesearch.io/?q=Edward%20Snowden">Edward Snowden</a></p>
 <p class="text-center"><a href="https://www.privatesearch.io/"><strong>privatesearch.io</strong></a> is our new privacy-respecting and highly customizable search engine with excellent results. it's open source and doesn't have ads, logs or tracking.</p>
-
 <hr>
 <br />
 -->
@@ -878,7 +874,6 @@
 			<br />
 			<a href="https://addons.mozilla.org/firefox/addon/disconnect/">https://addons.mozilla.org/firefox/addon/disconnect/</a>
 			</p>
-
 		<h3>Hinder Browser Fingerprinting with "Random Agent Spoofer"</h3>
 		<img src="img/addons/Random-Agent-Spoofer.gif" class="img-responsive pull-left" alt="Random Agent Spoofer" style="margin-right:30px;">
 		<p>A privacy enhancing firefox addon which aims to hinder browser fingerprinting. It does this by changing the browser/device profile on a timer. Source code: <a href="https://github.com/dillbyrne/random-agent-spoofer">GitHub.</a>
@@ -1618,6 +1613,7 @@
 			<li><a href="http://kontalk.org/">Kontalk</a> - A community-driven instant messaging network. Supports end-to-end encryption. Both client-to-server and server-to-server channels are fully encrypted.</li>
 			<li><a href="https://play.google.com/store/apps/details?id=eu.siacs.conversations">Conversations</a> - An open source Jabber/XMPP client for Android 4.4+ smart phones. Supports end-to-end encryption with either OMEMO or openPGP. There is also <a href="https://play.google.com/store/apps/details?id=eu.siacs.conversations.legacy">Conversations Legacy</a> which still supports OTR.</li>
 			<li><a href="https://en.wikipedia.org/wiki/Off-the-Record_Messaging#Client_support">List of OTR Clients - Wikipedia</a></li>
+			<li><a href="https://matrix.org/">The Matrix protocol</a> and it's various clients such as <a href="https://about.riot.im/">Riot.im</a>. A successor of XMPP.</li>
 		</ul>
 
 		<h3>Related Information</h3>
@@ -2585,6 +2581,18 @@
       <div class="row">
         <div class="col-sm-4">
           <div class="panel panel-success">
+            <div class="panel-heading">
+              <h3 class="panel-title">Ghostbin</h3>
+            </div>
+            <div class="panel-body">
+              <p><img src="img/tools/Ghostbin.png" alt="Ghostbin" align="right" style="margin-left:5px;">Ghostbin supports encryption, expiration, sessions, grant users to edit your notes and pastes up to one megabyte. You can also create your own account to keep track of your pastes.</p>
+
+              <p><a href="https://ghostbin.com/"><button type="button" class="btn btn-success">Website: ghostbin.com</button></a></p>
+            </div>
+          </div>
+        </div><!-- /.col-sm-4 -->
+        <div class="col-sm-4">
+          <div class="panel panel-info">
             <div class="panel-heading">
               <h3 class="panel-title">PrivateBin</h3>
             </div>
@@ -2596,7 +2604,7 @@
           </div>
         </div><!-- /.col-sm-4 -->
         <div class="col-sm-4">
-          <div class="panel panel-info">
+          <div class="panel panel-warning">
             <div class="panel-heading">
               <h3 class="panel-title">0bin</h3>
             </div>
@@ -2607,18 +2615,6 @@
             </div>
           </div>
         </div><!-- /.col-sm-4 -->
-	<div class="col-sm-4">
-          <div class="panel panel-warning">
-            <div class="panel-heading">
-              <h3 class="panel-title">Ghostbin</h3>
-            </div>
-            <div class="panel-body">
-              <p><img src="img/tools/Ghostbin.png" alt="Ghostbin" align="right" style="margin-left:5px;">Ghostbin supports <b>server side</b> encryption, expiration, sessions, grant users to edit your notes and pastes up to one megabyte. You can also create your own account to keep track of your pastes.</p>
-
-              <p><a href="https://ghostbin.com/"><button type="button" class="btn btn-success">Website: ghostbin.com</button></a></p>
-            </div>
-          </div>
-        </div><!-- /.col-sm-4 -->
       </div>
 
   <h3>Worth Mentioning</h3>