push dirctely
merge
Merge branch 'master' of https://github.com/bsplu/hello.git

Conflicts:
	src/hello.cpp