Added support for Backup to Google Drive
Added untracked files
Cleaned workspace
Fixed merge conflicts