adding assets from html mockup
merge conflict
adding mockup js