Back to normal
Merge branch 'master' of https://github.com/piyushparkash/LibreHatti

Conflicts:
	src/librehatti/settings.py