Add in joe

Change-Id: I870022660431e2fb0c926bba44c13d95651bceaf
Merge branch 'joe'
Change-Id: Ie36e811dd544a7214db4bd70f6686b1f5df1b6bb
Merge branch 'master' of git@github.com:guishoudaoge/hello-world.git

Conflicts:
	h

Change-Id: I7d700352575d63483d2de970818b08983b21c044