Edited Footer
Commit
fixed index.htm
Added text changed in branch
Merge branch 'seo_title'

Conflicts:
	index.htm