fixed #23
fixed #33
#34 add now time
update #36
added my name #36
test confilict #36
conflict test. #36
fixed #33
#36 add btishiwatasns
fixed #36
merged #36
update #36
conflict test. #36
Merge branch 'issues/34' of https://github.com/terasolunaorg/hello-git into issues/36
fixed README
Merge branch 'issues/36' of https://github.com/terasolunaorg/hello-git
into issues/36

Conflicts:
	README.md
merged #36
fixed #36
fixed #36
#36 btishiwatasns