for sync
change the index.php into our helloworld file
test
haha
testing
haha HEH
Merge branch 'master' of ssh://project-huangxx2155.rhcloud.com/~/git/project

Conflicts:
	index.php
add hot_deploy
zezeze
delete the name of the helloworld message
Merge branch 'master' of ssh://project-huangxx2155.rhcloud.com/~/git/project

Conflicts:
	index.php
i
1. add room/README.md