tesssss
Merge branch 'master' of https://github.com/sancomTest/ButtonSample.git

Conflicts:
	src/jp/todate/buttonsample/MainActivity.java