いらないコードを削除
Merge commit 'a80e43c1ee9c2129c81a638cc627eb97e3705779'

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