Merge remote-tracking branch 'li-xinyang/master' into Note

Conflicts:
	JavascriptDesignPattern/JavascriptDesignPattern.md
	Progress.md
	README.md
	WebCreation/WebCreation.md

Progress.md

@@ -2,12 +2,20 @@
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 **Table of Contents**  *generated with [DocToc](https://github.com/thlorenz/doctoc)*
 
+<<<<<<< HEAD
 - [Javascript程序设计 16/23](#javascript%E7%A8%8B%E5%BA%8F%E8%AE%BE%E8%AE%A1-1623)
+=======
+- [Javascript程序设计 20/23](#javascript%E7%A8%8B%E5%BA%8F%E8%AE%BE%E8%AE%A1-2023)
+>>>>>>> li-xinyang/master
 - [页面制作 39/41](#%E9%A1%B5%E9%9D%A2%E5%88%B6%E4%BD%9C-3941)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
+<<<<<<< HEAD
 # Javascript程序设计 16/23
+=======
+# Javascript程序设计 20/23
+>>>>>>> li-xinyang/master
 
 |章节|课题|状态|时间戳|
 |----|----|----|------|
@@ -27,10 +35,10 @@
 |内置对象|RegExp, Date, Error|★|1505312132|
 |内置对象|Math, JSON|★|1505312132|
 |内置对象|全局对象|★|1505312132|
-|表达式, 运算符|表达式, 运算符|||
-|语句|语句|||
-|变量作用域|变量作用域|||
-|闭包|闭包|||
+|表达式, 运算符|表达式, 运算符|★|1506091507|
+|语句|语句|★|1506091507|
+|变量作用域|变量作用域|★|150738|
+|闭包|闭包|★|1506091529|
 |面向对象|简介|||
 |面向对象|原型|||
 |面向对象|JS面向对象|||

README.md

@@ -19,7 +19,11 @@
 
 ### Javascript 程序设计
 
+<<<<<<< HEAD
 ![](http://progressed.io/bar/70?title=Progress) [详情](JavascriptDesignPattern/JavascriptDesignPattern.md)
+=======
+![](http://progressed.io/bar/87?title=Progress) [详情](JavascriptDesignPattern/JavascriptDesignPattern.md)
+>>>>>>> li-xinyang/master
 
 ### 页面制作