Locke versus Hobbes

Read this article, which contrasts Hobbes' views with those of Locke. What is the difference between Locke's view of the state of nature and Hobbes' view? What is the difference between Locke's and Hobbes' conception of the social contract?