shuwei
Merge remote-tracking branch 'origin/master'

Conflicts:
	Testing from ruoxi.docx
Merge branch 'master' of https://github.com/yanruoxi/IslandFurniture
Merge branch 'master' of https://github.com/yanruoxi/IslandFurniture

Conflicts:
	Testing from ruoxi.docx