resolving xml file conflicts
Merge branch 'master' of https://github.com/bowenbaker/FTPConnector

Conflicts:
	.idea/workspace.xml