Footer #comment Fixed Footer
Footer #comment @changes in base.scss
Footer #comment @changes in base.scss
Footer #comment footer completed
Resolved conflics