changed search bar
Merge remote-tracking branch 'origin/master'

Conflicts:
	my.php
try
Merge branch 'master' of https://github.com/kairusso/Beta_site

Conflicts:
	COLOR RATINGS.docx
	Sublime Project/w2.sublime-project
	Sublime Project/w2.sublime-workspace
	images/72.jpg
	my.php
	stylesSearch_final.css
	w2.sublime-workspace
Merge branch 'master' of https://github.com/kairusso/Beta_site