search
Merge branch 'master' of github.com:MrTweek/linux-home

Conflicts:
	.opera/search.ini