This file is used to test TortoiseGit
ver3
version 3
version 4
Merge branch 'master' of https://github.com/dotnetguru/SourceFun

Conflicts:
	script.txt