Merge pull request #1 from nejc92/master

#1
dsdas
Create doTheNewFile
Merge pull request #1 from TrznicaTest/ErrorPages

Error pages