cat 1 commit
ssd
asd
Merge branch 'master' of https://github.com/JeffreyWei/git-real

Conflicts:
	file
Merge branch 'cat'