Conflict.
Merge branch 'trunk' of https://github.com/bogdanneacsa/svn-ssh-demo into trunk

Conflicts:
	NewFile.txt