This is the new footer.
typo1
typo fix here
Merge branch 'refs/heads/new-footer'

Conflicts:
	index.php