implement asset pipeline
Merging changes