pridane subory
Merge branch 'master' of github.com:yettiSource/Barometer

Conflicts:
	project/project.sqlite
	project/project/__init__.py