nothing
Merge branch 'master' of https://github.com/steven198899/FriendshipsOnWeibo

Conflicts:
	app/__init__.pyc
	app/views.py
	app/views.pyc
	config.pyc
nothing