Beyond Compare - Beyond Compare allows you to compare files and folders.
BoxCryptor - Boxcryptor encrypts your sensitive files before uploading them to cloud storage services like Dropbox, Google Drive, Microsoft OneDrive, Box, and many others.
WinMerge - WinMerge is an open source differencing and merging tool for Windows.
Mega - Secure File Storage and collaboration
Meld - What is Meld? Meld is a visual diff and merge tool targeted at developers.
Google Drive - Access and sync your files anywhere