Trying to make the index.php work
Fixed conflict in index.html

Conflicts:
	HOMEPAGE/index.html