Answer:
A server is a computer that has server software loaded on it. Its main job is to share resources for clients.
A web server is a specific protocol type of server, looking only for HTTP requests instead of many different types of resource requests.