created banner and product
Resolve conflicts
Footer #comment Fixed Footer
added new file
Footer #comment @changes in base.scss
Footer #comment @changes in base.scss
nothing to commit
Footer #comment footer completed
changes in category page
changes in categor.ts
changes
nothing to commit
Resolved conflics
Nothing to commit
#comment added images
Merge branch 'master' into Review

Conflicts:
	assets/stylesheets/main.scss
	scripts/mappings.ts
Merge branch 'master' into Footer
Merge branch 'Footer'
added ts file
Merge branch 'master' into review