test2 commit
test4 commit
Merge remote-tracking branch 'origin/master' into branch1

Conflicts:
	app/src/main/java/jp/riverwest/myapplication/MainActivity.java