try new thema
Merge remote-tracking branch 'origin/master'

Conflicts:
	index2.php
	style/default.css