test
Merge branch 'master' of https://github.com/CapsLock-Studio/FlashChatRoom

Conflicts:
	public/index.php