Fixed 404 and 500 pages :)
Merge pull request #256 from jdalphon/master

Fixed 404 and 500 pages :)