modified
modified.
modified
Merge branch 'master' of https://github.com/tsuyopon/c--

Conflicts:
	README.md
	hiredis/sample1/sample1.cc
aaa
Merge branch 'master' of https://github.com/tsuyopon/c--

Conflicts:
	README.md
aaa