lay out changed
Merge branch 'anton2'

Conflicts:
	index.php