Merge branch 'ixquick' of https://github.com/pw3t/searx into ixquick

Conflicts:
	searx/engines/startpage.py

searx/engines/startpage.py

@@ -4,7 +4,6 @@ from lxml import html
 base_url = None
 search_url = None
 
-
 def request(query, params):
     global search_url
     query = urlencode({'q': query})[2:]

searx/settings.yml

@@ -68,6 +68,13 @@ engines:
 
   - name : startpage
     engine : startpage
+    base_url : 'https://startpage.com/'
+    search_url : 'https://startpage.com/do/search'
+
+  - name : ixquick
+    engine : startpage
+    base_url : 'https://www.ixquick.com/'
+    search_url : 'https://www.ixquick.com/do/search'
 
   - name : twitter
     engine : twitter