名前を表示
Merge commit 'acd9433ecb41cabf847f4d7fc129a60062ff69e7'

Conflicts:
	app/src/main/java/bijinwear/com/bijinwear/MainActivity.java