ボタン作成
Merge branch 'master' of https://github.com/misaox330/Branchtest

Conflicts:
	bin/classes/com/example/branchtest/R$layout.class
	bin/classes/com/example/branchtest/R$menu.class
	bin/classes/com/example/branchtest/R$string.class
	bin/classes/com/example/branchtest/R$style.class