Nieco som zmenil
Merge branch 'master' of https://github.com/yettiSource/Barometer

Conflicts:
	project/project/__pycache__/views.cpython-33.pyc
Merge branch 'master' of https://github.com/yettiSource/Barometer

Conflicts:
	project/project/templates/home.mako