submit code
mysql
deploy wsgi
Merge branch 'master' of https://github.com/lxserenade/flask

Conflicts:
	.DS_Store
	static/.DS_Store
	templates/nav.html
fix a bug