website update, combined css and js