Merge pull request #1116 from sunxb10/master

added two Git resources and adjusted some format details

free-programming-books-zh.md

@@ -5,6 +5,7 @@
 	* [操作系统](#操作系统)
 	* [版本控制](#版本控制)
 	* [数据库](#数据库)
+    * [智能系统](#智能系统)
 * [Erlang](#erlang)
 * [Golang](#golang)
 * [Haskell](#haskell)
@@ -26,10 +27,9 @@
 
 
 ### 语言无关
-* [一步步搭建物联网系统](https://github.com/gmszone/designiot)
 
 #### 在线教育
-* [MIT OCW -- 麻省理工学院“开放式课程网页”](http://ocw.mit.edu/courses/translated-courses/simplified-chinese/)
+* [MIT 公开课](http://ocw.mit.edu/courses/translated-courses/simplified-chinese/)
 * [Coursera](https://www.coursera.org/courses?orderby=upcoming&lngs=zh)
 * [Udacity](https://www.udacity.com/)
 * [xuetangX](https://www.xuetangx.com/)
@@ -41,7 +41,7 @@
 
 #### 软件开发方法
 * [硝烟中的 Scrum 和 XP](http://www.infoq.com/cn/minibooks/scrum-xp-from-the-trenches)
-* [文章《Functional Programming For The Rest of Us》的中文翻译](https://github.com/justinyhuang/Functional-Programming-For-The-Rest-of-Us-Cn)
+* [傻瓜函数编程](https://github.com/justinyhuang/Functional-Programming-For-The-Rest-of-Us-Cn) (《Functional Programming For The Rest of Us》中文版)
 
 
 #### 操作系统
@@ -55,21 +55,26 @@
 * [Git 参考手册](http://gitref.justjavac.com/)
 * [沉浸式学 Git](http://igit.linuxtoy.org/index.html)
 * [Got GitHub](https://github.com/gotgit/gotgithub)
+* [Git Community Book 中文版](http://gitbook.liuhui998.com/)
+* [学习 Git 分支](http://pcottle.github.io/learnGitBranching/) (点击右下角按钮可切换至简体及正体中文)
 
 
 #### 数据库
 * [The Little MongoDB Book 中文版](https://github.com/justinyhuang/the-little-mongodb-book-cn)
 * [Redis 设计与实现](http://www.redisbook.com)
 
+#### 智能系统
+* [一步步搭建物联网系统](https://github.com/gmszone/designiot)
+
 
 ### Erlang
-* [Erlang并发编程](https://github.com/liancheng/cpie-cn) (《Concurrent Programming in Erlang (Part I)》中文版)
+* [Erlang 并发编程](https://github.com/liancheng/cpie-cn) (《Concurrent Programming in Erlang (Part I)》中文版)
 
 
 ### Golang
-* [Go Web编程](https://github.com/astaxie/build-web-application-with-golang)
-* [Go编程基础](https://github.com/Unknwon/go-fundamental-programming)
-* [Go入门指南](https://github.com/Unknwon/the-way-to-go_ZH_CN) (《The Way to Go》中文版)
+* [Go Web 编程](https://github.com/astaxie/build-web-application-with-golang)
+* [Go 编程基础](https://github.com/Unknwon/go-fundamental-programming)
+* [Go 入门指南](https://github.com/Unknwon/the-way-to-go_ZH_CN) (《The Way to Go》中文版)
 * [学习 Go 语言](https://github.com/mikespook/Learning-Go-zh-cn)
 
 
@@ -79,7 +84,8 @@
 
 
 ### HTML / CSS
-* [学习CSS布局](http://zh.learnlayout.com/)
+* [学习 CSS 布局](http://zh.learnlayout.com/)
+* [HTML5 教程](http://www.w3school.com.cn/html5/)
 
 
 ### Javascript
@@ -111,7 +117,7 @@
 
 
 ### Python
-* [深入Python](http://woodpecker.org.cn/diveintopython/)
+* [深入 Python](http://woodpecker.org.cn/diveintopython/)
 * [笨办法学 Python](http://sebug.net/paper/books/LearnPythonTheHardWay/)
 * [简明 Python 教程](http://woodpecker.org.cn/abyteofpython_cn/chinese/) (《A Byte of Python》中文版)
 * [Django book 2.0](http://djangobook.py3k.cn/2.0/)
@@ -119,7 +125,7 @@
 
 ### R
 * [R 导论](http://cran.r-project.org/doc/contrib/Ding-R-intro_cn.pdf) (《An Introduction to R》中文版)
-* [153分钟学会R ](http://cran.r-project.org/doc/contrib/Liu-FAQ.pdf)
+* [153分钟学会 R ](http://cran.r-project.org/doc/contrib/Liu-FAQ.pdf)
 * [《R for beginners》中文版](http://www.biosino.org/R/R-doc/files/R4beg_cn_2.0.pdf)
 * [统计学与 R 读书笔记](http://cran.r-project.org/doc/contrib/Xu-Statistics_and_R.pdf)
 * [用 R 构建 Shiny 应用程序](http://yanping.me/shiny-tutorial/) (《Building 'Shiny' Applications with R》中文版)
@@ -143,7 +149,7 @@
 
 
 ### Scheme
-* [Scheme入门教程](http://deathking.github.io/yast-cn/) (《Yet Another Scheme Tutorial》中文版)
+* [Scheme 入门教程](http://deathking.github.io/yast-cn/) (《Yet Another Scheme Tutorial》中文版)
 
 
 ### Shell
@@ -152,7 +158,7 @@
 
 
 ### Vim
-* [大家來學VIM](http://www.study-area.org/tips/vim/index.html)
+* [大家來學 VIM](http://www.study-area.org/tips/vim/index.html)
 
 
 ### Visual Prolog