Fix Footer
Merge remote-tracking branch 'origin/master'

Conflicts:
	10years.html