hoge
Merge remote-tracking branch 'origin/master' into kazuminn

Conflicts:
	Numbers
Merge remote-tracking branch 'origin/master' into kazuminn

Conflicts:
	Numbers