Merge pull request #323 from zelgerj/master

styled welcome and errors page