Merge remote-tracking branch 'upstream/master'

Conflicts:
	free-programming-books-es.md
	free-programming-books-ru.md
	free-programming-interactive-tutorials-en.md

free-programming-interactive-tutorials-en.md

@@ -1,13 +1,26 @@
+###Bash
+* [Learn Shell Programming](http://www.learnshell.org)
+
+###C
+* [Learn C](http://www.learn-c.org/)
+
+###C#
+* [Learn C#](http://www.learncs.org/)
+
 ###Clojure
 * [Clojure Koans](http://clojurekoans.com/)
 * [ClojureScript Koans](http://clojurescriptkoans.com/)
+* [Try Clojure](http://tryclj.com/)
 
 
 ###CoffeeScript
 * [Smooth CoffeeScript, Interactive Edition](http://autotelicum.github.io/Smooth-CoffeeScript/interactive/interactive-coffeescript.html)
 
+###Erlang
+* [Try Erlang](http://www.tryerlang.org/)
 
 ###Git
+* [Githug](https://github.com/Gazler/githug) (Tutorial in shell)
 * [Try Git](http://try.github.io)
 * [Learn Git Branching](http://pcottle.github.io/learnGitBranching/)
 
@@ -15,9 +28,18 @@
 ###Go
 * [The Go Tutorial](http://golang.org/doc/go_tutorial.html)
 
+###Haskell
+* [Try Haskell!](http://tryhaskell.org/)
+
+###Java
+* [Learn Java](http://www.learnjavaonline.org/)
+
 
 ###Javascript
 * [Learning Advanced JavaScript](http://ejohn.org/apps/learn/)
+* [Learn JavaScript](http://www.learn-js.org/)
+* [Learn knockout.js](http://learn.knockoutjs.com)
+* [Try jQuery](http://try.jquery.com/)
 
 
 ###Lisp
@@ -30,16 +52,34 @@
 
 ###NoSQL
 * [MongoDB Koans](https://github.com/chicagoruby/MongoDB_Koans)
+* [Try Redis](http://try.redis.io/)
 
+<<<<<<< HEAD
 
 ###Objective-C
 * [Try Objective-C](http://tryobjectivec.codeschool.com)
 
+=======
+###Objective-C
+* [Try Objective-C](http://tryobjectivec.codeschool.com)
+
+###Ocaml
+* [Try Ocaml](http://try.ocamlpro.com/)
+
+###Perl
+* [Perltuts.com](http://perltuts.com)
+
+###PHP
+* [Learn PHP](http://www.learn-php.org/)
+>>>>>>> upstream/master
 
 ###Python
 * [How to Think Like a Computer Scientist: Learning with Python, Interactive Edition](http://interactivepython.org/courselib/static/thinkcspy/index.html)
+* [Learn Python](http://www.learnpython.org/)
 * [Python Koans](https://github.com/gregmalcolm/python_koans)
 
+###R
+* [Try R](http://tryr.codeschool.com)
 
 ###Ruby
 * [RubyMonk - Interactive Ruby tutorials](http://rubymonk.com)
@@ -50,3 +90,6 @@
 
 ###Scala
 * [Scala Tour](http://www.scala-tour.com/)
+
+###Vim
+* [Interactive Vim Tutorial](http://www.openvim.com/tutorial.html)