diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..4f95ced
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "python.pythonPath": "C:\\Program Files (x86)\\python.exe"
+}
\ No newline at end of file
diff --git a/README.md b/README.md
index 79c8b30..877768d 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,14 @@
-Python_Web_study 笔记
-##1.log大法
+# Python_Web_study 笔记
+## 1.log大法
 ```python
 def log(*args, **kwargs):
   print('log', *args, **kwargs)
 ```
-##2.request格式
+## 2.request格式
 ```python
 request = 'GET {} HTTP/1.1\r\nhost:{}\r\nCollection:close\r\n\r\n'.format(path, host)
 ```
-##3.server 接收 request, 并根据path 返回 response
+## 3.server 接收 request, 并根据path 返回 response
 ```python
 #使用with可以保证在程序中断的时候正确关闭socket并释放占用的端口
 with socket.socket() as s:
@@ -27,7 +27,7 @@ with socket.socket() as s:
                 log('error', e)
             connection.close()
 ```
-##4.response格式
+## 4.response格式
 ```python
 def error(code=404):
     e = {
@@ -62,7 +62,7 @@ def response_for_path(path):
     response = r.get(path, error)
     return response()
 ```
-##4.https
+## 4.https
 ```python
 import ssl
 s = ssl.wrap_socket(socket.socket())
diff --git a/class1/git b/class1/git
new file mode 100644
index 0000000..e69de29
diff --git a/class2/class2_1_2_code.py b/class2/class2_1_2_code.py
new file mode 100644
index 0000000..f5f45e6
--- /dev/null
+++ b/class2/class2_1_2_code.py
@@ -0,0 +1,185 @@
+# coding: utf-8
+"""
+课 2 上课用品
+2016.8.11
+
+本次上课的主要内容有
+0, 请注意代码的格式和规范
+1, 规范化生成响应
+2, HTTP 头
+3, 几个常用 HTML 标签及其用法
+4, HTTP 参数传递的两种方式
+
+"""
+# 下面这行注释是给 atom 的 pylint 用的, 忽略
+# pylint: disable=C0103
+
+"""
+url 的规范
+第一个 ? 之前的是 path
+? 之后的是 query
+http://c.cc/search?a=b&c=d&e=1
+PATH  /search
+QUERY a=b&c=d&e=1
+"""
+import socket
+
+
+# 定义一个 class 用于保存请求的数据
+class Request(object):
+    def __init__(self):
+        self.path = ''
+        self.query = {}
+
+# 定义一个 class 用于保存 message
+class Message(object):
+    def __init__(self):
+        self.message = ''
+        self.author = ''
+
+    def __repr__(self):
+        return '{}: {}'.format(self.author, self.message)
+#
+message_list = []
+request = Request()
+
+
+def log(*args, **kwargs):
+    """
+    用这个 log 替代 print
+    """
+    print('log', *args, **kwargs)
+
+
+def template(name):
+    with open(name, 'r', encoding='utf-8') as f:
+        return f.read()
+
+
+def route_index():
+    """
+    主页的处理函数, 返回主页的响应
+    """
+    header = 'HTTP/1.x 210 VERY OK\r\nContent-Type: text/html\r\n'
+    body = '<h1>Hello World</h1><img src="doge.gif"/>'
+    r = header + '\r\n' + body
+    return r.encode(encoding='utf-8')
+
+
+def route_message():
+    """
+    主页的处理函数, 返回主页的响应
+    """
+    msg = Message()
+    msg.author = request.query.get('author', '')
+    msg.message = request.query.get('message', '')
+    message_list.append(msg)
+    header = 'HTTP/1.x 210 VERY OK\r\nContent-Type: text/html\r\n'
+    # body = '<h1>消息版</h1>'
+    body = template('html_basic.html')
+    msgs = '<br>'.join([str(m) for m in message_list])
+    body = body.replace('{{messages}}', msgs)
+    r = header + '\r\n' + body
+    return r.encode(encoding='utf-8')
+
+
+def route_image():
+    """
+    图片的处理函数, 读取图片并生成响应返回
+    """
+    with open('doge.gif', 'rb') as f:
+        header = b'HTTP/1.x 200 OK\r\nContent-Type: image/gif\r\n\r\n'
+        img = header + f.read()
+        return img
+
+
+def error(code=404):
+    """
+    根据 code 返回不同的错误响应
+    目前只有 404
+    """
+    # 之前上课我说过不要用数字来作为字典的 key
+    # 但是在 HTTP 协议中 code 都是数字似乎更方便所以打破了这个原则
+    e = {
+        404: b'HTTP/1.x 404 NOT FOUND\r\n\r\n<h1>NOT FOUND</h1>',
+    }
+    return e.get(code, b'')
+
+
+def parsed_path(path):
+    """
+    message=hello&author=gua
+    {
+        'message': 'hello',
+        'author': 'gua',
+    }
+    """
+    index = path.find('?')
+    if index == -1:
+        return path, {}
+    else:
+        path, query_string = path.split('?', 1)
+        args = query_string.split('&')
+        query = {}
+        for arg in args:
+            k, v = arg.split('=')
+            query[k] = v
+        return path, query
+
+
+def response_for_path(path):
+    path, query = parsed_path(path)
+    request.path = path
+    request.query = query
+    log('path and query', path, query)
+    """
+    根据 path 调用相应的处理函数
+    没有处理的 path 会返回 404
+    """
+    r = {
+        '/': route_index,
+        '/doge.gif': route_image,
+        '/messages': route_message,
+    }
+    response = r.get(path, error)
+    return response()
+
+
+def run(host='', port=3000):
+    """
+    启动服务器
+    """
+    # 初始化 socket 套路
+    # 使用 with 可以保证程序中断的时候正确关闭 socket 释放占用的端口
+    with socket.socket() as s:
+        s.bind((host, port))
+        # 无限循环来处理请求
+        while True:
+            # 监听 接受 读取请求数据 解码成字符串
+            s.listen(3)
+            connection, address = s.accept()
+            request = connection.recv(1000)
+            request = request.decode('utf-8')
+            log('ip and request, {}\n{}'.format(address, request))
+            try:
+                # 因为 chrome 会发送空请求导致 split 得到空 list
+                # 所以这里用 try 防止程序崩溃
+                path = request.split()[1]
+                # 用 response_for_path 函数来得到 path 对应的响应内容
+                response = response_for_path(path)
+                # 把响应发送给客户端
+                connection.sendall(response)
+            except Exception as e:
+                log('error', e)
+            # 处理完请求, 关闭连接
+            connection.close()
+
+
+if __name__ == '__main__':
+    # 生成配置并且运行程序
+    config = dict(
+        host='',
+        port=3000,
+    )
+    # 如果不了解 **kwargs 的用法, 上过基础课的请复习函数, 新同学自行搜索
+    run(**config)
diff --git a/pfe/helloworld.py b/pfe/helloworld.py
new file mode 100644
index 0000000..7305ade
--- /dev/null
+++ b/pfe/helloworld.py
@@ -0,0 +1,4 @@
+import typing
+
+
+print('Hello World!')
\ No newline at end of file
diff --git a/test.txt b/test.txt
new file mode 100644
index 0000000..e69de29