renamed two columns
Merge branch 'master' of https://github.com/fuqcool/perfetch_server

Conflicts:
	perfetch_server/models.py