Signed-off-by: Hirokazu Endo <endohirokazu@me.com>
Merge branch 'master' of ssh://git@github.com/endohirokazu/jssample.git

Conflicts:
	aaa.txt