local
Merge branch 'master' of https://github.com/Charlesdong/MyProject

Conflicts:
	bloger/views.pyc
Merge branch 'master' of https://github.com/Charlesdong/MyProject
new