еще чуть-чуть
Merge remote-tracking branch 'origin/master'

Conflicts:
	www/_create.php
Merge branch 'master' of https://github.com/begem0t23/vremenagoda

Conflicts:
	www/_create.php
	www/functions.inc.php