footer commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/slide_text.css
	index1.php