winscp line
Merge branch 'master' of https://github.com/kungfooman/Test into HEAD

Conflicts:
	1.txt