modified index.html and added 404.html
test merge
test merge