После 6-го урока
Merge branch 'master' of github.com:Sersergei/chat

Conflicts:
	class/templater.class.php
	class/validate.class.php
	db/chat.db
	index.php