footer and homepage change
Merge remote-tracking branch 'origin/master'

Conflicts:
	left/second.html