Merge branch 'patch-1' of git://github.com/damiann/free-programming-books into damiann-patch-1

Conflicts:
	free-programming-books.md

free-programming-books.md

@@ -244,7 +244,8 @@
 
 
 ###Django
-
+* [Djen of Django](http://agiliq.com/books/djenofdjango/)
+* [Django by Example](http://www.lightbird.net/dbe/)
 
 
 ###Emacs
@@ -318,6 +319,7 @@
 * [OSGi in Practice](http://njbartlett.name/files/osgibook_preview_20091217.pdf) (PDF)
 * [Category wise tutorials - J2EE](http://www.mkyong.com/)
 * [Introduction to Programming Using Java - David J. Eck](http://math.hws.edu/javanotes/index.html)
+* [O'Reilly Programming JavaScript Applications - Early Release](http://chimera.labs.oreilly.com/books/1234000000262/index.html)
 
 
 ###JavaScript
@@ -393,11 +395,6 @@
 * [HGInit - Mercurial Tutorial by Joel Spolsky](http://hginit.com/)
 
 
-###Nemerle
-
-* See <strong>.NET</strong> below
-
-
 ###.NET (C# / VB / Nemerle / Visual Studio)
 
 * [C# Essentials](http://www.techotopia.com/index.php/C_Sharp_Essentials)