zmiany
Merge branch 'master' of github.com:Razi91/blisko

Conflicts:
	README.md
	web/models.py