Testing cows (Eclipse and testing conflicts)
Merge branch 'master' of
ssh://git@github.com/softwarepros-net/SFTP.NET_Development.git

Conflicts:
	Testing File 2.txt
----------------
"Fixed" The Cow! yay!