thinkpadで変更
Merge branch 'master' of https://github.com/takaboo/gittest

Conflicts:
	readme.txt