syncmaster
syncmyster
this is basic
Merge branch 'master' of github.com:shoemonkey/flask-upstart

Conflicts:
	blog/app/__init__.pyc
	blog/db_migrate.py
login form started