Update Test.pm on masterbranch to create a merge conflict on feature
branch.
Merge branch 'master' of ssh://git@github.com/rteixeiraep/TestPerl.git
into TestFeature

Conflicts:
	Test.pm