Merge pull request #59 from nejc92/master

bugfix
Merge pull request #3 from ipri2013/master

bugfixed
Pep8 correction.
Merge branch 'master' of https://github.com/juree/fritrznica

Conflicts:
	fritrznica/cakalnica/views.py
	fritrznica/fritrznicaData
pep8
Vsa koda po PEP8 standardu.
Merge pull request #60 from juree/master

PEP8
Merge pull request #10 from ipri2013/master

Updating my fork