"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."
add test_sorting_publications.py, previously deleted by mistake
Added breadcrumb to the webpages. It's not agile enough, and it's not a
very good idea because you have many "webpages (e.g.
/statisticsdetails/publication_author)" that use the same HTML file
(e.g. statistics_details.html)
Revert "add test_sorting_publications.py, previously deleted by mistake"

This reverts commit b0557d5b020719031459415579cfe8e0422794ce.
Merge branch 'master' of https://github.com/lokshunjustinchan/comp61542-2014-lab
Merge remote-tracking branch 'justins/master'
merge with justins changes