Merge pull request #336 from aveao/master

Moved qwant to Worth Mentioning, SP to 2nd and DDG to 3rd as discussed on #84

index.html

@@ -1433,27 +1433,10 @@ <h3 class="panel-title">searx</h3>
         </div>
 
 			<!-- /.col-sm-4 -->
-			<div class="col-sm-4">
-				<div class="panel panel-info">
-					<div class="panel-heading">
-						<h3 class="panel-title">Qwant</h3>
-					</div>
-					<div class="panel-body">
-						<p><img src="img/provider/Qwant.png" alt="Qwant" align="right" style="margin-left:5px;">Qwant's philosophy is based on two principles: no user tracking and no filter bubble. Qwant was launched in France in February 2013. <a href="https://www.qwant.com/privacy">Privacy Policy.</a></p>
-
-						<p>
-							<a href="https://www.qwant.com/">
-								<button type="button" class="btn btn-info">Website: qwant.com</button>
-							</a>
-						</p>
-					</div>
-				</div>
-			</div>
-			<!-- /.col-sm-4 -->
 
 
 			<div class="col-sm-4">
-				<div class="panel panel-warning">
+				<div class="panel panel-info">
 					<div class="panel-heading">
 						<h3 class="panel-title">StartPage</h3>
 					</div>
@@ -1462,12 +1445,30 @@ <h3 class="panel-title">StartPage</h3>
 
 						<p>
 							<a href="https://www.startpage.com/">
-								<button type="button" class="btn btn-warning">Website: startpage.com</button>
+								<button type="button" class="btn btn-info">Website: startpage.com</button>
 							</a>
 						</p>
 					</div>
 				</div>
 			</div>
+
+			<div class="col-sm-4">
+	        	<div class="panel panel-warning">
+		          	<div class="panel-heading">
+		            	<h3 class="panel-title">DuckDuckGo</h3>
+		          	</div>
+		          	<div class="panel-body">
+		            	<p><img src="img/provider/DuckDuckGo.jpg" alt="DuckDuckGo" align="right" style="margin-left:5px;">The search engine that doesn't track you. Some of DuckDuckGo's code is free software hosted at <a href="https://github.com/duckduckgo">GitHub</a>, but the core is proprietary. <span class="flag-icon flag-icon-us"></span> <a href="#ukusa">The company is based in the USA.</a></p>
+
+		            	<p>
+		              		<a href="https://duckduckgo.com/">
+		              		<button type="button" class="btn btn-warning">Website: duckduckgo.com</button>
+		            		</a>
+		              		<a data-toggle="tooltip" data-placement="bottom" data-original-title="http://3g2upl4pq6kufc4m.onion. Requires specific software to access: torproject.org" href="http://3g2upl4pq6kufc4m.onion"><img src="img/layout/tor.png" width="35"></img></a>
+		            	</p>
+		          	</div>
+	        	</div>
+      		</div>
 		</div>
 
 		<h3>Firefox Addon</h3>
@@ -1480,16 +1481,16 @@ <h3>Firefox Addon</h3>
 
 		<h3>Worth Mentioning</h3>
 		<ul>
+			<li>
+				<a href="https://www.qwant.com/">Qwant</a> - Qwant's philosophy is based on two principles: no user tracking and no filter bubble. Qwant was launched in France in February 2013. <a href="https://www.qwant.com/privacy">Privacy Policy.</a>
+			</li>
 			<li>
 				<a href="https://metager.de/en/">MetaGer</a> - An open source metasearch engine, which is based in Germany. It focuses on protecting the user's privacy.
 			</li>
 
 			<li>
 				<a href="https://www.ixquick.eu/">ixquick.eu</a> - Returns the top results from multiple search engines. Based in the Netherlands.
 			</li>
-			<li>
-				<a href="https://duckduckgo.com/">DuckDuckGo</a> - A private search engine that does not track you. <span class="flag-icon flag-icon-us"></span> <a href="https://github.com/privacytoolsIO/privacytools.io/issues/84" data-toggle="tooltip" data-placement="top" data-original-title="Interesting discussion on GitHub regarding DuckDuckGo">US based service</a>
-			</li>
 		</ul>