added back 404 page
deleted unnecessary files, fixed merge conflict