Revert "qerqwerq"

This reverts commit 9ed1d7a32aa3e3a6f06ba91b2f5963789afed111.

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

Conflicts:
	Readme.txt
123123453434534
555555
888888
Merge branch 'master' of https://github.com/Daeno/chatroom
12354545645465464
234234234234
hahahahahahahahahah
fucking change by tang
Merge branch 'master' of https://github.com/Daeno/chatroom
123456789987654231
Merge pull request #1 from Daeno/master

123456