add two files and chang one file
not work?
master change too
Merge branch 'newHello', and solves conflict

Conflicts:
	readme