add_otsuki2
Merge commit 'a4afa09e5f7eb4c81736a52c85692b455ffec3c2'
otsuki
Merge commit '7ab4ca307006dcef0be0201b565e1b5b9ba49059'

Conflicts:
	test.txt
gitIgnore