新文件:       flask/cookies_test.py
	新文件:       flask/hello.py
	新文件:       flask/http.py
	新文件:       flask/microblog/app.db
	新文件:       flask/microblog/app/__init__.py
	新文件:       flask/microblog/app/__init__.pyc
	新文件:       flask/microblog/app/forms.py
	新文件:       flask/microblog/app/forms.pyc
	新文件:       flask/microblog/app/models.py
	新文件:       flask/microblog/app/models.pyc
	新文件:       flask/microblog/app/templates/404.html
	新文件:       flask/microblog/app/templates/500.html
	新文件:       flask/microblog/app/templates/base.html
	新文件:       flask/microblog/app/templates/edit.html
	新文件:       flask/microblog/app/templates/index.html
	新文件:       flask/microblog/app/templates/login.html
	新文件:       flask/microblog/app/templates/post.html
	新文件:       flask/microblog/app/templates/user.html
	新文件:       flask/microblog/app/views.py
	新文件:       flask/microblog/app/views.pyc
	新文件:       flask/microblog/config.py
	新文件:       flask/microblog/config.pyc
	新文件:       flask/microblog/db_create.py
	新文件:       flask/microblog/db_downgrade.py
	新文件:       flask/microblog/db_migrate.py
	新文件:       flask/microblog/db_repository/README
	新文件:       flask/microblog/db_repository/__init__.py
	新文件:       flask/microblog/db_repository/__init__.pyc
	新文件:       flask/microblog/db_repository/migrate.cfg
	新文件:       flask/microblog/db_repository/versions/001_migration.py
	新文件:       flask/microblog/db_repository/versions/001_migration.pyc
	新文件:       flask/microblog/db_repository/versions/002_migration.py
	新文件:       flask/microblog/db_repository/versions/002_migration.pyc
	新文件:       flask/microblog/db_repository/versions/003_migration.py
	新文件:       flask/microblog/db_repository/versions/003_migration.pyc
	新文件:       flask/microblog/db_repository/versions/004_migration.py
	新文件:       flask/microblog/db_repository/versions/004_migration.pyc
	新文件:       flask/microblog/db_repository/versions/__init__.py
	新文件:       flask/microblog/db_repository/versions/__init__.pyc
	新文件:       flask/microblog/db_upgrade.py
	新文件:       flask/microblog/logger.conf
	新文件:       flask/microblog/make_data.py
	新文件:       flask/microblog/run.py
	新文件:       flask/microblog/runp.py
	新文件:       flask/microblog/test.db
	新文件:       flask/microblog/test.py
	新文件:       flask/microblog/tmp/associations/https-www.google.com-apdYYPrtQGUIj7Vp7jMTz.Kn74A-rZwwav7yd.rXgQKJxsbq_3QBrJY
	新文件:       flask/microblog/tmp/microblog.log
	新文件:       flask/microblog/tmp/nonces/538aea98-https-www.google.com-apdYYPrtQGUIj7Vp7jMTz.Kn74A-4VMoUGw9ACSDEQkTG4qdOP1x0Us
	新文件:       flask/microblog/tmp/nonces/538aeb40-https-www.google.com-apdYYPrtQGUIj7Vp7jMTz.Kn74A-RffsixoFNmy2RzOEqF0Y545r.v4
	新文件:       flask/microblog/tmp/nonces/538af297-https-www.google.com-apdYYPrtQGUIj7Vp7jMTz.Kn74A-4tAndGhcgSBD6suI6kHdQwgVbkU
	新文件:       flask/microblog/tmp/nonces/538c4a4b-https-www.google.com-apdYYPrtQGUIj7Vp7jMTz.Kn74A-uFQ.Cg18XAjr.qGYW1X1HmOJtP8
	新文件:       flask/microblog/tmp/nonces/538c8c03-https-www.google.com-apdYYPrtQGUIj7Vp7jMTz.Kn74A-zRwCRnMjj_r07ObGjkNnrgbcV4s
	新文件:       flask/microblog/tmp/nonces/538c8c15-https-www.google.com-apdYYPrtQGUIj7Vp7jMTz.Kn74A-NsW362dM15ZTEdguIuo.rYZ37vc
	新文件:       flask/microblog/tmp/nonces/538c8c22-https-www.google.com-apdYYPrtQGUIj7Vp7jMTz.Kn74A-Ws5AiGOea3UvT0dxNBCruJZvCyc
	新文件:       flask/microblog/tmp/nonces/538c8c44-https-www.google.com-apdYYPrtQGUIj7Vp7jMTz.Kn74A-ccI70C26S2d1zTyUA4vLKpWoZoc
	新文件:       flask/microblog/tmp/nonces/538c8c63-https-www.google.com-apdYYPrtQGUIj7Vp7jMTz.Kn74A-MZTB2F7Tx7rydlQ8Z0l1b9akkD0
	新文件:       flask/microblog/tmp/nonces/538c8c9e-https-www.google.com-apdYYPrtQGUIj7Vp7jMTz.Kn74A-cXV0uOsN8.DlPyVKZpi7PYBR0BA
	新文件:       flask/microblog/tmp/nonces/538c8cb6-https-www.google.com-apdYYPrtQGUIj7Vp7jMTz.Kn74A-JAqrqQtzlQZe3Vg7CNRc4F9V168
	新文件:       flask/microblog/tmp/nonces/538decc9-https-www.google.com-apdYYPrtQGUIj7Vp7jMTz.Kn74A-yULw21uX2ng1kI7VKSgakRscxGk
	新文件:       flask/microblog/tmp/nonces/53bda90e-https-www.google.com-apdYYPrtQGUIj7Vp7jMTz.Kn74A-J0sTC.S3wXOPQs7Mug7nPoXiB1A
	新文件:       flask/microblog/tmp/nonces/53bde9a4-https-www.google.com-apdYYPrtQGUIj7Vp7jMTz.Kn74A-NNKsJKH25F7mnpSKu8Neif4CiHA
	新文件:       flask/microblog/tmp/nonces/53bf2874-https-www.google.com-apdYYPrtQGUIj7Vp7jMTz.Kn74A-C.zaRkAamncMrjCU_uMYoUEsNEQ
	新文件:       flask/microblog/tmp/nonces/53bf297d-https-www.google.com-apdYYPrtQGUIj7Vp7jMTz.Kn74A-eeXkj7XjLU.e6nGHrlKgyv4Zuy8
	新文件:       flask/microblog/tmp/test_log.txt
	新文件:       flask/microblog/virtualenv.py
	新文件:       flask/microblog/virtualenv.pyc
	新文件:       flask/myweb/html5-zerofour.zip
	新文件:       flask/myweb/html5-zerofour/css/5grid/core-1000px.css
	新文件:       flask/myweb/html5-zerofour/css/5grid/core-1200px.css
	新文件:       flask/myweb/html5-zerofour/css/5grid/core-desktop.css
	新文件:       flask/myweb/html5-zerofour/css/5grid/core-fluid.css
	新文件:       flask/myweb/html5-zerofour/css/5grid/core-mobile.css
	新文件:       flask/myweb/html5-zerofour/css/5grid/core-noscript.css
	新文件:       flask/myweb/html5-zerofour/css/5grid/core.css
	新文件:       flask/myweb/html5-zerofour/css/5grid/html5shiv.js
	新文件:       flask/myweb/html5-zerofour/css/5grid/init.js
	新文件:       flask/myweb/html5-zerofour/css/5grid/jquery.js
	新文件:       flask/myweb/html5-zerofour/css/5grid/mobileUI-beveled.css
	新文件:       flask/myweb/html5-zerofour/css/5grid/mobileUI-flat.css
	新文件:       flask/myweb/html5-zerofour/css/5grid/mobileUI-modern.css
	新文件:       flask/myweb/html5-zerofour/css/ie7.css
	新文件:       flask/myweb/html5-zerofour/css/ie8.css
	新文件:       flask/myweb/html5-zerofour/css/ie9.css
	新文件:       flask/myweb/html5-zerofour/css/images/bg01.jpg
	新文件:       flask/myweb/html5-zerofour/css/images/bg02.jpg
	新文件:       flask/myweb/html5-zerofour/css/images/bg03.png
	新文件:       flask/myweb/html5-zerofour/css/images/bg04.png
	新文件:       flask/myweb/html5-zerofour/css/images/button-active.svg
	新文件:       flask/myweb/html5-zerofour/css/images/button-alt-active.svg
	新文件:       flask/myweb/html5-zerofour/css/images/button-alt-hover.svg
	新文件:       flask/myweb/html5-zerofour/css/images/button-alt.svg
	新文件:       flask/myweb/html5-zerofour/css/images/button-hover.svg
	新文件:       flask/myweb/html5-zerofour/css/images/button.svg
	新文件:       flask/myweb/html5-zerofour/css/images/footer-wrapper.svg
	新文件:       flask/myweb/html5-zerofour/css/images/header-inner.svg
	新文件:       flask/myweb/html5-zerofour/css/images/icons.png
	新文件:       flask/myweb/html5-zerofour/css/images/mobileUI-site-nav-opener-bg.svg
	新文件:       flask/myweb/html5-zerofour/css/style-1000px.css
	新文件:       flask/myweb/html5-zerofour/css/style-desktop.css
	新文件:       flask/myweb/html5-zerofour/css/style-mobile.css
	新文件:       flask/myweb/html5-zerofour/css/style.css
	新文件:       flask/myweb/html5-zerofour/images/banner.jpg
	新文件:       flask/myweb/html5-zerofour/images/pic01.jpg
	新文件:       flask/myweb/html5-zerofour/images/pic02.jpg
	新文件:       flask/myweb/html5-zerofour/images/pic03.jpg
	新文件:       flask/myweb/html5-zerofour/images/pic04.jpg
	新文件:       flask/myweb/html5-zerofour/images/pic05.jpg
	新文件:       flask/myweb/html5-zerofour/images/pic06.jpg
	新文件:       flask/myweb/html5-zerofour/images/pic07.jpg
	新文件:       flask/myweb/html5-zerofour/images/pic08.jpg
	新文件:       flask/myweb/html5-zerofour/index.html
	新文件:       flask/myweb/html5-zerofour/js/init.js
	新文件:       flask/myweb/html5-zerofour/js/jquery-1.8.3.min.js
	新文件:       flask/myweb/html5-zerofour/js/jquery.dropotron-1.2.js
	新文件:       flask/myweb/html5-zerofour/left-sidebar.html
	新文件:       flask/myweb/html5-zerofour/no-sidebar.html
	新文件:       flask/myweb/html5-zerofour/right-sidebar.html
	新文件:       flask/session.py
	新文件:       flask/sqlalchemy/sqla_test.py
	新文件:       flask/sqlalchemy/sqla_test.pyc
	新文件:       flask/sqlalchemy/testinglines.py
	新文件:       flask/sqlalchemy/testrelationship.py
	新文件:       flask/test1/application.py
	新文件:       flask/test1/templates/hello.html
	新文件:       flask/url_for.py
	新文件:       flask/wsgi/wsgi-tutorial.tar.gz
Merge https://github.com/PiscesDream/Websites

Conflicts:
	flask/http.py
	flask/microblog/app.db
	flask/microblog/app/__init__.py
	flask/microblog/app/__init__.pyc
	flask/microblog/app/forms.py
	flask/microblog/app/forms.pyc
	flask/microblog/app/models.py
	flask/microblog/app/models.pyc
	flask/microblog/app/templates/edit.html
	flask/microblog/app/templates/index.html
	flask/microblog/app/templates/post.html
	flask/microblog/app/templates/user.html
	flask/microblog/app/views.py
	flask/microblog/app/views.pyc
	flask/microblog/config.py
	flask/microblog/config.pyc
	flask/sqlalchemy/sqla_test.pyc
	flask/sqlalchemy/testinglines.py
	flask/url_for.py

	新文件:       ../../.gitignore
	新文件:       ../../README.md
	修改:         ../http.py
	修改:         app/__init__.py
	修改:         app/forms.py
	修改:         app/models.py
	修改:         app/templates/edit.html
	修改:         app/templates/index.html
	修改:         app/templates/post.html
	修改:         app/templates/user.html
	修改:         app/views.py
	修改:         config.py
	新文件:       tmp/associations/https-www.google.com-apdYYPrtQGUIj7Vp7jMTz.Kn74A-_PmKerq7RzXM.BwypXpSl13YVY0
	修改:         ../sqlalchemy/testinglines.py
	修改:         ../url_for.py