fixing formatting
Conflicts:
	index.php