FTP put functionality. Updated gitignore.
Fixed merge conflict