stuffssss
Merge branch 'master' of https://github.com/voidyknight/BlogEngine

Conflicts:
	app.py