The right answers are "chatter files" and "documents".
You can upload a file and store it privately until you're ready to share it. Share the file with coworkers and groups to collaborate and get feedback. Attach files to posts in a Chatter feed on the Home tab, Chatter tab, a profile, a record, or a group. Users with access to Salesforce Files Sync can access, sync, and share files in their Salesforce Files Sync folder.
Store Web resources, such as, logos, DOT files, and other Visualforce materials in folders without attaching them to records.
Documentsis the original way to store files in Salesforce. Many of the original features of Salesforce (email templates, application logos, etc.) will only reference files in the documents tab. No sharing mechanism, but files can be exposed for public consumption. Allows for replacement of a document, but no version control. Access is controlled by folders.