New JS/CSS folders
Merge conflict in index.html
moving js/css files to the new dir