rm .idea dir
Merge branch 'master' of https://github.com/diaocow/django-web