test1
Revert "qerqwerq"

This reverts commit 9ed1d7a32aa3e3a6f06ba91b2f5963789afed111.

Conflicts:
	Readme.txt
Merge branch 'new-branch1' of https://github.com/Daeno/chatroom

Conflicts:
	Readme.txt