pridany parser
Merge branch 'master' of github.com:yettiSource/Barometer

Conflicts:
	project/project/__init__.py
	project/project/__pycache__/__init__.cpython-33.pyc
	project/project/__pycache__/models.cpython-33.pyc
	project/project/__pycache__/tests.cpython-33.pyc
	project/project/__pycache__/views.cpython-33.pyc
	project/project/scripts/__pycache__/__init__.cpython-33.pyc
	project/project/scripts/__pycache__/initializedb.cpython-33.pyc
	project/project/views.py
	project/project/views.py.orig
initilial zmene
Merge branch 'master' of github.com:yettiSource/Barometer

Conflicts:
	project/project/__init__.py