Merge branch 'master' of github.com:vhf/free-programming-books
Merge remote-tracking branch 'central/master'
Update free-programming-books.md

Fixed typo.
Merge remote-tracking branch 'central/master'
Merge remote-tracking branch 'central/master'
[en] Added a .NET book
[en] Ording .Net section
Merge pull request #794 from esparta/master

[en] New book on .NET section & sorting
[en] Added CS240h: Functional Systems in Haskell
Merge pull request #795 from guillaume-nargeot/master

[en] Added CS240h: Functional Systems in Haskell
Modified the Django list to contain version numbers
Merge pull request #796 from Kentoseth/master

Modified the Django list to contain version numbers
Fix the URL for the Introduction to Data Science book
Merge pull request #797 from ryanoreilly/master

Fix the URL for the Introduction to Data Science book
Update Windows 8 book; adding a incomplete v2
Merge pull request #798 from KilFer/patch-1

Update Windows 8 book; adding a incomplete v2
20,000
Add a bash book:  Conquering the Command Line
[es] New section (& book): Erlang
Merge pull request #799 from HungMingWu/master

Add a bash book:  Conquering the Command Line