Add 3 from test-ssh
Merge branch 'master' of github.com:knowfirm/test

Conflicts:
	test.txt