add fff
Merge branch 'master' of github.com:toshiotm/sample

Conflicts:
	sample.txt
add hhh
Merge branch 'master' of github.com:toshiotm/sample

Conflicts:
	sample.txt
Merge branch 'master' of github.com:toshiotm/sample

Conflicts:
	sample.txt