fixing index.php
fixed conflict

Conflicts:
	functions/index.php