deleted one line
Merge branch 'branch1' of https://github.com/uc-dpt/Chating.git into
branch1

Conflicts:
	index.php