name 1
Merge branch 'master' of https://github.com/Blank-Yang/hello

Conflicts:
	blank/hello.cc

name 1