update
Merge branch 'master' of https://github.com/jstamb02/advanced-css-layout

Conflicts:
	Jeni-Sean/css/about-module.css
	Jeni-Sean/css/base.css
	Jeni-Sean/css/grid.css
	Jeni-Sean/css/layout.css
make requested corrections