vyhladávanie v dicte
Merge branch 'master' of https://github.com/yettiSource/Barometer

Conflicts:
	project/project/views.py