bring in upstream

free-courses-en.md

@@ -17,7 +17,6 @@
 * [LearnCpp.com C++ Tutorial](http://www.learncpp.com/)
 
 
-
 ###Databases
 * [Database Systems](http://ocw.mit.edu/courses/electrical-engineering-and-computer-science/6-830-database-systems-fall-2010/) (MIT's opencourseware)
 * [Introduction to Databases](https://class.stanford.edu/courses/Engineering/db/2014_1/about) (Stanford University)
@@ -38,6 +37,7 @@
 * [Codecademy Walkthrough](http://www.codecademy.com/tracks/javascript)
 * [LearnStreet Walkthrough](https://www.learnstreet.com/lessons/study/javascript)
 
+
 ###Java
 * [Introduction to Java](http://ocw.mit.edu/courses/electrical-engineering-and-computer-science/6-092-introduction-to-programming-in-java-january-iap-2010/)
 * [Central Connecticut State University, Introduction to CS Using Java](http://chortle.ccsu.edu/CS151/cs151java.html)
@@ -45,6 +45,7 @@
 * [Princeton Algorithms, Part 1](https://www.coursera.org/course/algs4partI)
 * [Princeton Algorithms, Part 2](https://www.coursera.org/course/algs4partII)
 
+
 ###iOS
 * [Developing iOS 7 Apps for iPhone and iPad](https://itunes.apple.com/us/course/developing-ios-7-apps-for/id733644550) (slides and videos) - Stanford University
 * [AppCoda Complete iOS Tutorial](http://www.appcoda.com/ios-programming-course/)
@@ -53,6 +54,7 @@
 ###OCaml
 * [Cornell's Data Structures and Functional Programming](http://www.cs.cornell.edu/courses/cs3110/)
 
+
 ###Oracle PL/SQL
 * [Steven Feuerstein's PL/SQL Obsession - Videos and Presentations](http://www.toadworld.com/platforms/oracle/w/wiki/8243.plsql-obsession.aspx)
 

free-programming-interactive-tutorials-en.md

@@ -42,6 +42,11 @@
 * [Try Haskell!](http://tryhaskell.org/)
 
 
+###HTML&CSS
+* [Learn HTML & CSS interactively](http://www.codecademy.com/tracks/web)
+* [Prototyping a professional website](http://www.codecademy.com/skills/prototyping)
+
+
 ###Java
 * [Learn Java](http://www.learnjavaonline.org/)
 
@@ -83,6 +88,7 @@
 
 
 ###Python
+* [Codecademy Python course](http://www.codecademy.com/tracks/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)
@@ -94,6 +100,7 @@
 
 ###Ruby
 * [CodeCademy Ruby](http://www.codecademy.com/tracks/ruby)
+* [Codeschool Ruby paths](https://www.codeschool.com/paths/ruby)
 * [Ruby Koans](http://www.rubykoans.com/)
 * [RubyMonk - Interactive Ruby tutorials](http://rubymonk.com)
 * [Try Ruby](http://tryruby.org/)