restore local_settings_dev。py.
This file can't be ignored for unknow reason,but don't delete it!
Just don't commit or push it after you change settings in it.
Merge branch 'master' of https://github.com/hust/pingjia_repo_dev.git

Conflicts:
	pingjia/local_settings_dev.py