"added some test cases for search_function"
Merged changes
Merge branch 'master' of https://github.com/vaslabs/comp61542-2014-lab
Merge branch 'master' of https://github.com/vaslabs/comp61542-2014-lab

Conflicts:
	test/test_sorting_publications.py
Merge branch 'master' of http://github.com/chaireg0/comp61542-2014-lab
Contributing to the 3rd part of sprint4:
"3. As a first time visitor to the Computer Science website, I want to
understand how to use each part of the application."
Cosmetics
Recovered test