sdfs#
Merge branch 'master' of https://github.com/LiminZhang2004/HelloWorldForGit

Conflicts:
	resources/test.js

merged#