Use composer.json and lock
add a css and js file
ignore the vendor directory
fix path
Merge remote-tracking branch 'upstream/master'