2
Merge branch 'master' of https://github.com/rkovrigin/kvartiry

Conflicts:
	kvartiry.py