new direction with site
fresh start
new blog site
Merge branch 'master' of github.com:shoemonkey/flask-upstart

Conflicts:
	blog/app/__init__.pyc
	blog/app/views.pyc