MERGE

erichideki · erichideki · commit 97f0ce6b4a6e · 2015-09-29T22:01:30.000-03:00
diff --git a/404.html b/404.html
@@ -67,7 +67,7 @@
     </style>
 </head>
 <body>
-    <img src="img/logo.PNG">
+    <img src="/img/logo.PNG">
     <h1>Page Not Found</h1>
     <p>This is not the web page you are looking for.</p>
     <br>
diff --git a/applications/app-markdowns/database-access.md b/applications/app-markdowns/database-access.md
@@ -31,6 +31,7 @@ Database Drivers
 * [queries](https://github.com/gmr/queries) - A wrapper of the psycopg2 library for interacting with PostgreSQL.
 * [txpostgres](http://txpostgres.readthedocs.org/) - Twisted based asynchronous driver for PostgreSQL.
 * [cx_Oracle](http://cx-oracle.sourceforge.net/) - The Oracle database connector for Python.
+* [pymssql](http://www.pymssql.org/) - A simple database interface to Microsoft SQL Server.
 
 ### NoSQL Databases
 
@@ -77,3 +78,4 @@ The following people helped in creating the above content.
 * Contributors to <a href="https://github.com/vinta/awesome-python" target="_blank">awesome-python</a>
 * [Quasar Jarosz](https://github.com/quasarj)
 * [iury](https://github.com/IuryAlves)
+* [Ermogenes Palacio](https://github.com/ermogenes/)
diff --git a/applications/app-markdowns/devops.md b/applications/app-markdowns/devops.md
@@ -15,6 +15,7 @@ DevOps Tools
 * [Docker Compose](https://docs.docker.com/compose/) - Fast, isolated development environments using [Docker](https://www.docker.com/).
 * [Fabtools](https://github.com/ronnix/fabtools) - Tools for writing awesome Fabric files.
 * [gitapi](http://bitbucket.org/haard/gitapi) - Pure-Python API for git.
+* [GitPython](https://github.com/gitpython-developers/GitPython) - Python library used to interact with git repositories
 * [gunnery](https://github.com/gunnery/gunnery) - Multipurpose task execution tool for distributed systems with web-based interface.
 * [hgapi](http://bitbucket.org/haard/hgapi) - Pure-Python API for Mercurial.
 * [honcho](https://github.com/nickstenning/honcho) - A Python port of [Foreman](https://github.com/ddollar/foreman), a tool for managing Procfile-based applications.
diff --git a/applications/app-markdowns/embedded-python.md b/applications/app-markdowns/embedded-python.md
@@ -13,10 +13,12 @@ Hardware
 * [PyUserInput](https://github.com/SavinaRoja/PyUserInput) - A module for cross-platform control of the mouse and keyboard.
 * [scapy](http://www.secdev.org/projects/scapy/) - A brilliant packet manipulation library.
 * [wifi](https://wifi.readthedocs.org/) - A Python library and command line tool for working with WiFi on Linux.
+* [Pingo](http://pingo.io) - Pingo provides a uniform API to program devices like the Raspberry Pi, pcDuino, Intel Galileo, etc.
 
 Contributors
 ============
 
 The following people helped in creating the above content.
 
-* Contributors to <a href="https://github.com/vinta/awesome-python" target="_blank">awesome-python</a>
+* Contributors to <a href="https://github.com/vinta/awesome-python" target="_blank">awesome-python</a>
+* <a href="https://github.com/leotada" target="_blank">leotada</a>
diff --git a/applications/app-markdowns/guis.md b/applications/app-markdowns/guis.md
@@ -18,10 +18,13 @@ GUI
 * [Toga](https://github.com/pybee/toga) - A Python native, OS native GUI toolkit.
 * [urwid](http://urwid.org/) - A library for creating terminal GUI applications with strong support for widgets, events, rich colors, etc.
 * [wxPython](http://wxpython.org/) - A blending of the wxWidgets C++ class library with the Python.
+* [PyGObject](https://wiki.gnome.org/Projects/PyGObject) - Python Bindings for GLib/GObject/GIO/GTK+ (GTK+3)
+* [Flexx](https://github.com/zoofIO/flexx) - Flexx is a pure Python toolkit for creating GUI's, that uses web technology for its rendering.
 
 Contributors
 ============
 
 The following people helped in creating the above content.
 
-* Contributors to <a href="https://github.com/vinta/awesome-python" target="_blank">awesome-python</a>
+* Contributors to <a href="https://github.com/vinta/awesome-python" target="_blank">awesome-python</a>
+* <a href="https://github.com/leotada" target="_blank">leotada</a>
diff --git a/applications/app-markdowns/web-development.md b/applications/app-markdowns/web-development.md
@@ -112,6 +112,7 @@ Authentication
     * [PyJWT](https://github.com/progrium/pyjwt) - Implementation of the JSON Web Token draft 01.
     * [python-jws](https://github.com/brianloveswords/python-jws) - Implementation of JSON Web Signatures draft 02.
     * [python-jwt](https://github.com/davedoesdev/python-jwt) - Module for generating and verifying JSON Web Tokens.
+    * [django-rest-framework-jwt](https://github.com/GetBlimp/django-rest-framework-jwt) - JSON Web Token Authentication support for Django REST Framework
 
 Geolocation
 -----------
@@ -416,6 +417,8 @@ Books/Resources
 * [Test-Driven Development with Python](http://chimera.labs.oreilly.com/books/1234000000754/)
 * [Lightweight Django](http://www.amazon.in/Lightweight-Django/dp/149194594X/)
 * [High Performance Django ](http://www.amazon.in/High-Performance-Django/dp/1508748128/)
+* [Tango with Django ](http://www.tangowithdjango.com/)
+* [Mastering Django](http://masteringdjango.com/)
 
 Online courses/Videos
 ---------------------
@@ -435,5 +438,10 @@ The following people helped in creating the above content.
 
 * Contributors to <a href="https://github.com/vinta/awesome-python" target="_blank">awesome-python</a>
 * [Timothy Edmund Crosley](https://github.com/timothycrosley)
+<<<<<<< HEAD
 * [Eric Hideki](https://github.com/erichideki/)
+=======
+* [Sandip Bhagat](https://github.com/sandipbgt)
+* [Mohit Bajoria](https://github.com/mbj36)
+>>>>>>> upstream/develop
 
