2222
1111
Merge branch 'branch1' of
https://github.com/ninehole90/git_remote_test.git into branch1

Conflicts:
	test1.c