add html
Merge branch 'master' of github.com:modeyang/Django_Learn
	modified:   Django_Learn/settings.py
	modified:   Django_Learn/urls.py
	modified:   sqlite.db
	modified:   templates/404.html
	CeleryUtil.py
	Lawson/
	scrapy.py
Merge branch 'master' of github.com:modeyang/Django_Learn

Conflicts:
	sqlite.db

	new file:   Blog/__init__.py
	new file:   Blog/models.py
	new file:   Blog/tests.py
	new file:   Blog/urls.py
	new file:   Blog/views.py
	modified:   Django_Learn/settings.py
	modified:   Django_Learn/urls.py
	deleted:    static/bootstrap/test.html
	deleted:    static/bootstrap/test2.html
	renamed:    static/bootstrap/css/bootstrap-responsive.css -> static/css/bootstrap-responsive.css
	renamed:    static/bootstrap/css/bootstrap-responsive.min.css -> static/css/bootstrap-responsive.min.css
	renamed:    static/bootstrap/css/bootstrap.css -> static/css/bootstrap.css
	renamed:    static/bootstrap/css/bootstrap.min.css -> static/css/bootstrap.min.css
	renamed:    static/bootstrap/img/glyphicons-halflings-white.png -> static/img/glyphicons-halflings-white.png
	renamed:    static/bootstrap/img/glyphicons-halflings.png -> static/img/glyphicons-halflings.png
	renamed:    static/bootstrap/js/bootstrap.js -> static/js/bootstrap.js
	renamed:    static/bootstrap/js/bootstrap.min.js -> static/js/bootstrap.min.js
	new file:   templates/blog/base.html
	new file:   templates/blog/blog_add.html
	new file:   templates/blog/blog_base.html
	new file:   templates/blog/blog_list.html
	new file:   templates/blog/blog_show.html

	CeleryUtil.py
	scrapy.py