masterで編集
testで編集
Merge branch 'test'

Conflicts:
	test.txt
Merge branch 'test2'

Conflicts:
	test.txt
画像変更
Merge branch 'master' of https://github.com/testReposTeam20141227/testRepos1 into test2

Conflicts:
	test.txt