Add hello
Merge branch 'master' into conflict

Conflicts:
	README.md
Merge pull request #2 from ogis-yano/conflict

Add hello