Merge pull request #42 from zigaemersic/master

Ker je ura pozna (zgodnja) si bom spet dovolil tole kar sam mergeat.
pep8 check
Merge https://github.com/ipri2013/opencollea
Merge pull request #43 from aOberstar/master

pep8 spellcheck
Merge pull request #14 from ipri2013/master

PEP8