Testing conflict 2
Resolved conflic

Conflicts:
	index.php