Changes to be committed:
	modified:   websearch/config.py
	modified:   websearch/config.pyc
Merge branch 'master' of http://github.com/ssh0/web_search
 Changes to be committed:
	modified:   websearch/config.py