changes vefore pull
rm ds store
tweaks to 404 page
tweaks to 404 page
fixed merge
tweaks to 404 page