second commit
third commit
xx
x
x
a
a
gitignore
gitignore
gitignore2
Merge branch 'master' of /home/ec2-user/repos/ss

Conflicts:
	.gitignore
c
Merge branch 'master' of /home/ec2-user/repos/ss
ignore
Merge branch 'master' of /home/ec2-user/repos/ss
ignore
Merge branch 'master' of /home/ec2-user/repos/ss
ignore3
ignore4
ignore5