Footer #comment Fixed Footer
Footer #comment @changes in base.scss
Footer #comment @changes in base.scss
Footer #comment footer completed
meha-01
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
#comment Made changes
changes in review files
Merge branch 'master' of https://github.com/maitryshah/featheryournesthome
Merge branch 'master' into Banner

Conflicts:
	assets/stylesheets/globals/_base.scss