add hello by wmp1-1
Merge branch 'master' of git@github.com:1suny1/wmp1.git

Conflicts:
	hello