Resolved merge conflict with upstream master

.gitignore

@@ -1,2 +1,6 @@
 .DS_Store
+
 *.py[co]
+
+docs/index.md
+site/

CONTRIBUTING.md

@@ -4,12 +4,14 @@ Your contributions are always welcome!
 
 ## Guidelines
 
-* Add section if needed.
-    * Add section description.
-    * Add section title to Table of contents.
+* Add one link per Pull Request.
+* Add the link: `* [project-name](http://example.com/) - A short description ends with a period.`
+    * Keep descriptions concise.
+* Add a section if needed.
+    * Add the section description.
+    * Add the section title to Table of Contents.
 * Search previous suggestions before making a new one, as yours may be a duplicate.
-* Add your links: `* [project-name](http://example.com/) - A short description ends with a dot.`
 * Don't mention `Python` in the description as it's implied.
 * Check your spelling and grammar.
-* Make sure your text editor is set to remove trailing whitespace.
-* Send a Pull Request.
+* Remove any trailing whitespace.
+* Send a Pull Request with the reason why the library is awesome.

Makefile

@@ -0,0 +1,16 @@
+BASEDIR=$(CURDIR)
+DOCDIR=$(BASEDIR)/docs
+
+install:
+	pip install mkdocs
+
+link:
+	ln -sf $(BASEDIR)/README.md $(DOCDIR)/index.md
+
+preview:
+	$(MAKE) link
+	mkdocs serve
+
+deploy:
+	$(MAKE) link
+	mkdocs gh-deploy --clean

docs/CNAME

@@ -0,0 +1 @@
+awesome-python.com

docs/extra.css

@@ -0,0 +1,37 @@
+.bs-sidebar.well {
+    /* margin-bottom: 0; */
+}
+
+.bs-sidebar .nav > li > a:hover,
+.bs-sidebar .nav > li > a:focus {
+    border: none;
+    border-left: 2px solid;
+}
+
+.bs-sidebar .nav > .active > a,
+.bs-sidebar .nav > .active:hover > a,
+.bs-sidebar .nav > .active:focus > a {
+    border: none;
+    border-left: 2px solid;
+}
+
+@media (min-width: 992px) {
+    .bs-sidebar.affix {
+        /* top: 60px; */
+        /* bottom: 0px; */
+        top: 80px;
+        bottom: 23px;
+        overflow: auto;
+    }
+}
+
+@media (min-width: 1200px) {
+    .bs-sidebar.affix-bottom,
+    .bs-sidebar.affix {
+        width: 280px;
+    }
+
+    .container > .col-md-9 {
+        padding-left: 40px;
+    }
+}

mkdocs.yml

@@ -0,0 +1,9 @@
+site_name: Awesome Python
+site_url: http://awesome-python.com
+site_description: A curated list of awesome Python frameworks, libraries and software
+site_author: Vinta Chen
+repo_url: https://github.com/vinta/awesome-python
+theme: flatly
+google_analytics: ['UA-510626-7', 'auto']
+pages:
+  - "Life is short, you need Python.": "index.md"