404

added a 404 page
Merge branch '404'