merging in the JS and CSS files

@vtimofee