Creating structure 2
Merge remote branch 'origin/master'

Conflicts:
	index.php