renamed the css and js to match the project name.
Merge remote-tracking branch 'origin/master'