tag search
Merge branch 'dev_tim' of https://github.com/timbrady/htdocs into dev_tim

Conflicts:
	schools/tag_search.php