edited by nakamura
testing agin
testing agin by nanglin
Merge pull request #1 from nanglin/testbranch

pull request
updated by nanglin
added line in merge
updated by nanglin
added line in merge
test
Merge branch 'testbranch'
test
edited test branch by nanglin
Merge branch 'testbranch'

Conflicts:
	testbranch.txt
added hello msg
commit by nanglin
# This is a combination of 2 commits.
# The first commit's message is:

1st commit

# This is the 2nd commit message:

2nd commit
1st test
Revert "revert commit"

This reverts commit e9ed437837e2328299bd812e5055b0080575166a.
Merge branch 'recoverd-my-story'