real merge again
merge
Merge branch 'master' of https://github.com/kairusso/Beta_site

Conflicts:
	search_final.html
	stylesSearch_final.css