A test for git merging process
Merge pull request #1 from JoeyCarolyn/master

TestFormergingProcess