remove setting.py
Merge branch 'master' of github.com:bobrynya/achernyakov.ru

Conflicts:
	settings.py