fixed links to css and js.
merging