working on 404
fixed merge conflict
Styled 404 page, first draft