fix merge conflict?
fix merge PLZ
removed .pyc files
Merge branch 'master' of https://github.com/infinity9001/th13
models.py
fix merge conflict please