pyc changes
pyc conflict
Merge branch 'master' of http://github.com/tianyaox/mysite
Merge branch 'master' of http://github.com/tianyaox/mysite
fix conflict