temp commit
Merge branch 'master' of https://github.com/todjiang/gaeblog

Conflicts:
	blog.py