Second test - trying out branching on github
Merge branch 'test2'

Conflicts:
	index.php