up
Merge branch 'master' of github.com:oleyang/microblog

Conflicts:
	app/views.py