Merge branch 'master' of https://github.com/asciimoo/searx
Merge branch 'featured_result'
[ehn] added ixquick engine, using startpage engine
Merge branch 'master' of https://github.com/asciimoo/searx
[ehn] added ixquick engine, using startpage engine
Merge branch 'ixquick' of https://github.com/pw3t/searx into ixquick

Conflicts:
	searx/engines/startpage.py
Merge pull request #29 from pw3t/ixquick

Ixquick