Error pages added
Merge remote-tracking branch 'upstream/master'
Merge pull request #4 from jank0s/master

Error pages added