git-1 Test
git-1 Test subtask2
Merge remote-tracking branch 'origin/git-1'

Conflicts:
	README.rdoc
Initial