conflict 2 test.
conflict modified.
Merge branch 'issues/36' of https://github.com/terasolunaorg/hello-git
into issues/36

Conflicts:
	README.md