update
Merge branch 'master' of https://github.com/tomrcroft/CMPE133Project

Conflicts:
	formatresult.css
	search.php