Testing a commit after a merging tool operation
Merge pull request #1 from imanti/testing-branch

Testing a commit after a merging tool operation