aaa

bbb
Merge branch 'master' of https://github.com/gamagori1/testRepositry

Conflicts:
	aaa.txt