GIT commit.
Merge branch 'trunk' of https://github.com/bogdanneacsa/svn-ssh-demo into trunk
GIT commit to get conflict.
Merge branch 'trunk' of https://github.com/bogdanneacsa/svn-ssh-demo into trunk

Conflicts:
	DemoFile.txt
merge