Merge pull request #3 from yickli/master

Merge!
Merge pull request #4 from yickli/master

remove .pyc files OK
Update models.py处理冲突

修改Project models.py
处理冲突