Revert "conflict"

This reverts commit 5aaa9ebb1ba08f1769dc9fa6d4d3da4d34aa6063.

Conflicts:
	_/inc/foot.php
	index.php