Add world
Merge branch 'master' of https://github.com/binhe/tryGit

Conflicts:
	octocat.txt