sphinx
Merge branch 'master' of github.com:Nozdi/shmir

Conflicts:
	src/shmir/settings.py