Merge pull request #1 from sndmw/練習

練習
テストです
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master' into 練習

Conflicts:
	app/src/main/java/sonodamiwa/myapplication/MainActivity.java