Merge branch 'settings' of github.com:nilp0inter/dataisfun3 into settings

Conflicts:
	src/dataisfun3/config.py