Add hi again
Merge remote-tracking branch 'origin/rebase-conflict' into rebase-conflict

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

Add hi again