Merge branch 'gh-pages' of github.com:makaimc/fullstackpython.github.com into gh-pages

mattmakai · mattmakai · commit 29328878f3dc · 2014-01-14T15:49:18.000-08:00
diff --git a/index.html b/index.html
@@ -283,7 +283,7 @@ <h1>Web Server</h1>
 <p>In a simple case, the client will request a static asset such as a picture
 or JavaScript file. The file sits on the file system in a location the
 web server is authorized to access and the web server sends the file
-to the clinet with a 200 status code. If the client already requested the
+to the client with a 200 status code. If the client already requested the
 file and the file has not changed, the web server will pass back a 304
 &quot;Not modified&quot; response indicating the client already has the latest version
 of that file.</p>
