stuff
stuff2
Merge branch 'Scott' of https://github.com/Infininte/JSDW_FTP_Project into Scott

Conflicts:
	FTPBoss/FTPBoss.v12.suo
	FTPBoss/FTPBoss/FTPSource/FTPConnect.cs
	FTPBoss/FTPBoss/MainWindow.xaml.cs
	FTPBoss/FTPBoss/bin/Debug/FTPBoss.exe
	FTPBoss/FTPBoss/bin/Debug/FTPBoss.pdb
	FTPBoss/FTPBoss/bin/Debug/FTPBoss.vshost.exe.manifest
	FTPBoss/FTPBoss/obj/Debug/ConnectionManagement.baml
	FTPBoss/FTPBoss/obj/Debug/ConnectionManagement.g.cs
	FTPBoss/FTPBoss/obj/Debug/ConnectionManagement.g.i.cs
	FTPBoss/FTPBoss/obj/Debug/FTPBoss.csproj.FileListAbsolute.txt
	FTPBoss/FTPBoss/obj/Debug/FTPBoss.csproj.GenerateResource.Cache
	FTPBoss/FTPBoss/obj/Debug/FTPBoss.csprojResolveAssemblyReference.cache
	FTPBoss/FTPBoss/obj/Debug/FTPBoss.exe
	FTPBoss/FTPBoss/obj/Debug/FTPBoss.g.resources
	FTPBoss/FTPBoss/obj/Debug/FTPBoss.pdb
	FTPBoss/FTPBoss/obj/Debug/FTPBoss_MarkupCompile.i.lref
	FTPBoss/FTPBoss/obj/Debug/MainWindow.baml
	FTPBoss/FTPBoss/obj/Debug/MainWindow.g.cs
	FTPBoss/FTPBoss/obj/Debug/MainWindow.g.i.cs