Merge pull request #1 from TrznicaTest/ErrorPages

Error pages
Update doTheNewFile
Merge pull request #5 from nejc92/master

Error pages23