changes
FYNH-PRODUCT #comment changes
no message
changes
Merge branch 'master' into FYNH-PRODUCT

Conflicts:
	scripts/mappings.ts
more changes
no message
changes in base.scss
#comment finished email-friend page
Merge branch 'master' into FYNH-EMAIL-FRIEND
created search icon and cart icon
Merge branch 'master' of https://github.com/maitryshah/featheryournesthome
Merge branch 'master' into review
changes
Merge branch 'Checkout'

Conflicts:
	assets/stylesheets/main.scss