穂乃果ちゃん
海未ちゃん
Merge branch 'master' into develope

Conflicts:
	test.rb